diff --git a/src/layout.c b/src/layout.c
index 7d6cd63..89754d6 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -18,16 +18,16 @@ void maximize_client(client_t *c) {
   monitor_t *m = c->monitor;
   c->x = m->window_x;
   c->y = m->window_y;
-  c->width = m->window_width;
-  c->height = m->window_height;
+  c->width = m->window_width - 2 * c->border_width;
+  c->height = m->window_height - 2 * c->border_width;
 }
 
 void fullscreen_client(client_t *c) {
   monitor_t *m = c->monitor;
   c->x = m->monitor_x;
   c->y = m->monitor_y;
-  c->width = m->monitor_width;
-  c->height = m->monitor_height;
+  c->width = m->monitor_width - 2 * c->border_width;
+  c->height = m->monitor_height - 2 * c->border_width;
 }
 
 void monocle(monitor_t *monitor) {