diff --git a/windows/nonclient.c b/windows/nonclient.c
index 41efc2f..5d65d63 100644
--- a/windows/nonclient.c
+++ b/windows/nonclient.c
@@ -2048,9 +2048,10 @@
     else
     {  /* Grab the server only when moving top-level windows without desktop */
 	hdc = GetDC32( 0 );
-	if (rootWindow == DefaultRootWindow(display)) TSXGrabServer( display );
     }
 
+    wndPtr->pDriver->pPreSizeMove(wndPtr);
+
     if( iconic ) /* create a cursor for dragging */
     {
 	HICON16 hIcon = (wndPtr->class->hIcon) ? wndPtr->class->hIcon
@@ -2146,9 +2147,10 @@
     else
     {
 	ReleaseDC32( 0, hdc );
-	if (rootWindow == DefaultRootWindow(display)) TSXUngrabServer( display );
     }
 
+    wndPtr->pDriver->pPostSizeMove(wndPtr);
+
     if (HOOK_IsHooked( WH_CBT ))
     {
 	RECT16* pr = SEGPTR_NEW(RECT16);