diff --git a/src/client.c b/src/client.c
index 3bb7a7f1031ecdcc80da3dedf7800d78caedf77b..a34408fc07460adc80ed3acb710652b574ac070c 100644
--- a/src/client.c
+++ b/src/client.c
@@ -884,7 +884,9 @@ clientMoveResizeWindow (Client *c, XWindowChanges * wc, unsigned long mask)
         /* Ignore stacking request for DESKTOP windows */
         mask &= ~(CWSibling | CWStackMode);
     }
-    if (FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
+    if (FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
+        || (FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
+            && (c->screen_info->params->borderless_maximize)))
     {
         /* Not allowed in fullscreen mode */
         mask &= ~(CWX | CWY | CWWidth | CWHeight);