diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c
index b74f258f3..82d7f930c 100755
--- a/hw/xwin/winmultiwindowwndproc.c
+++ b/hw/xwin/winmultiwindowwndproc.c
@@ -387,23 +387,30 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
       /*
        * Any window menu items go through here
        */
-      /* If minimizing then remove always-on-top, and store the setting */
-      if (wParam == SC_MINIMIZE)
+      switch (wParam & 0xFFF0) /* See MSDN for the magic number 0xFFF0 */
 	{
+	case SC_MINIMIZE:
+	  /* If minimizing then remove always-on-top, and store the setting */
 	  if (GetWindowLong (hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST)
 	    pWinPriv->fAlwaysOnTop = TRUE;
 	  else
 	    pWinPriv->fAlwaysOnTop = FALSE;
 	  SetWindowPos(hwnd, HWND_BOTTOM, 0, 0, 0, 0,
 		       SWP_NOMOVE|SWP_NOSIZE);
-	}
-      else if (wParam == SC_RESTORE)
-	{
+	  break;
+
+	case SC_RESTORE:
 	  if (pWinPriv->fAlwaysOnTop)
 	    SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0,
 			 SWP_NOMOVE|SWP_NOSIZE);
+	  break;
+
+	default:
+	  if (HandleCustomWM_COMMAND ((unsigned long)hwnd, LOWORD(wParam)))
+	    /* Don't pass customized menus to DefWindowProc */
+	    return 0;
+	  break;
 	}
-      HandleCustomWM_COMMAND ((unsigned long)hwnd, LOWORD(wParam));
       break;
 
     case WM_INITMENU:
diff --git a/hw/xwin/winprefs.c b/hw/xwin/winprefs.c
index 67443ed54..6fb7f0c6c 100644
--- a/hw/xwin/winprefs.c
+++ b/hw/xwin/winprefs.c
@@ -284,9 +284,10 @@ HandleCustomWM_INITMENU(unsigned long hwndIn,
 }
     
 /*
- * Searches for the custom WM_COMMAND command ID and performs action
+ * Searches for the custom WM_COMMAND command ID and performs action.
+ * Return TRUE if command is proccessed, FALSE otherwise.
  */
-int
+Bool
 HandleCustomWM_COMMAND (unsigned long hwndIn,
 			int           command)
 {
@@ -298,7 +299,7 @@ HandleCustomWM_COMMAND (unsigned long hwndIn,
   hwnd = (HWND)hwndIn;
 
   if (!command)
-    return 0;
+    return FALSE;
 
   for (i=0; i<pref.menuItems; i++)
     {
@@ -332,12 +333,12 @@ HandleCustomWM_COMMAND (unsigned long hwndIn,
 		      exit (0);
 		    }
 		  else
-		    return 0;
+		    return TRUE;
 		  break;
 		  
 		case CMD_ALWAYSONTOP:
 		  if (!hwnd)
-		    return 0;
+		    return FALSE;
 
 		  /* Get extended window style */
 		  dwExStyle = GetWindowLong (hwnd, GWL_EXSTYLE);
@@ -355,20 +356,20 @@ HandleCustomWM_COMMAND (unsigned long hwndIn,
 				  0, 0,
 				  0, 0,
 				  SWP_NOSIZE | SWP_NOMOVE);
-		  return 0;
+		  return TRUE;
 		  
 		case CMD_RELOAD:
 		  ReloadPrefs();
-		  return 0;
+		  return TRUE;
 
 		default:
-		  return 0;
+		  return FALSE;
 	      }
 	    } /* match */
 	} /* for j */
     } /* for i */
 
-  return 0;
+  return FALSE;
 }
 
 
diff --git a/hw/xwin/winprefs.h b/hw/xwin/winprefs.h
index b2f5ae724..3f07c103c 100644
--- a/hw/xwin/winprefs.h
+++ b/hw/xwin/winprefs.h
@@ -132,7 +132,7 @@ void
 HandleCustomWM_INITMENU(unsigned long hwndIn,
 			unsigned long hmenuIn);
 
-int
+Bool
 HandleCustomWM_COMMAND (unsigned long hwndIn,
 			int           command);
 
diff --git a/hw/xwin/winwndproc.c b/hw/xwin/winwndproc.c
index dc3cd63a2..5180c0bcb 100644
--- a/hw/xwin/winwndproc.c
+++ b/hw/xwin/winwndproc.c
@@ -1069,7 +1069,8 @@ winWindowProc (HWND hwnd, UINT message,
 
 	default:
 	  /* It's probably one of the custom menus... */
-	  return HandleCustomWM_COMMAND (0, LOWORD (wParam));
+	  if (HandleCustomWM_COMMAND (0, LOWORD (wParam)))
+	    return 0;
 	}
       break;