diff --git a/src/wndproc.c b/src/wndproc.c
index fdba2a6..c683160 100644
--- a/src/wndproc.c
+++ b/src/wndproc.c
@@ -377,8 +377,20 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
             return DefWindowProc(hWnd, uMsg, wParam, lParam); /* Carmageddon fix */
         }
 
+        case WM_NCMOUSELEAVE:
+        {
+            if (!g_ddraw->wine) /* hack: disable aero snap */
+                real_SetWindowLongA(g_ddraw->hwnd, GWL_STYLE, GetWindowLong(g_ddraw->hwnd, GWL_STYLE) | WS_MAXIMIZEBOX);
+
+            break;
+        }
         case WM_SYSCOMMAND:
 
+            if ((wParam & ~0x0F) == SC_MOVE && !g_ddraw->wine) /* hack: disable aero snap */
+            {
+                real_SetWindowLongA(g_ddraw->hwnd, GWL_STYLE, GetWindowLong(g_ddraw->hwnd, GWL_STYLE) & ~WS_MAXIMIZEBOX);
+            }
+
             if (wParam == SC_MAXIMIZE)
             {
                 if (g_ddraw->resizable)