diff -ur xfwm4-4.4.1/src/client.c xfwm4-4.4.1.new/src/client.c
--- xfwm4-4.4.1/src/client.c	2007-10-17 22:28:33.000000000 +0200
+++ xfwm4-4.4.1.new/src/client.c	2007-10-17 22:29:51.000000000 +0200
@@ -3025,6 +3025,7 @@
         {
             c->win_state |= WIN_STATE_MAXIMIZED;
             FLAG_SET (c->flags, CLIENT_FLAG_MAXIMIZED);
+            FLAG_UNSET (c->xfwm_flags, XFWM_FLAG_HAS_BORDER | XFWM_FLAG_HAS_MENU);
             return;
         }
     }
@@ -3051,6 +3052,7 @@
 
     c->win_state &= ~WIN_STATE_MAXIMIZED;
     FLAG_UNSET (c->flags, CLIENT_FLAG_MAXIMIZED);
+    FLAG_SET (c->xfwm_flags, XFWM_FLAG_HAS_BORDER | XFWM_FLAG_HAS_MENU);
     wc->x = c->old_x;
     wc->y = c->old_y;
     wc->width = c->old_width;