diff --git a/client.c b/client.c
index 0047754c3..853059706 100644
--- a/client.c
+++ b/client.c
@@ -855,6 +855,8 @@ client_maximize(Client *c, int x, int y, int w, int h)
 {
     if((c->ismax = !c->ismax))
     {
+        c->oldborder = c->border;
+        c->border = 0;
         c->wasfloating = c->isfloating;
         c->isfloating = True;
         client_resize(c, x, y, w, h, False, True);
@@ -864,6 +866,8 @@ client_maximize(Client *c, int x, int y, int w, int h)
     else
         c->isfloating = False;
 
+    c->border = c->oldborder;
+
     arrange(c->screen);
 }