diff --git a/openbox/client.c b/openbox/client.c
index da38843b..875c790b 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1685,6 +1685,10 @@ void client_setup_decor_and_functions(ObClient *self)
         }
     }
 
+    /* can't resize maximized windows */
+    if (self->max_horz && self->max_vert)
+        self->functions &=~ OB_CLIENT_FUNC_RESIZE;
+
     if (!(self->functions & OB_CLIENT_FUNC_SHADE))
         self->decorations &= ~OB_FRAME_DECOR_SHADE;
     if (!(self->functions & OB_CLIENT_FUNC_ICONIFY))
@@ -1700,10 +1704,6 @@ void client_setup_decor_and_functions(ObClient *self)
         self->decorations &= ~OB_FRAME_DECOR_MAXIMIZE;
     }
 
-    /* kill the handle on fully maxed windows */
-    if (self->max_vert && self->max_horz)
-        self->decorations &= ~(OB_FRAME_DECOR_HANDLE | OB_FRAME_DECOR_GRIPS);
-
     /* If there are no decorations to remove, don't allow the user to try
        toggle the state */
     if (self->decorations == 0)