diff --git a/src/osd/windows/window.c b/src/osd/windows/window.c
index d89c15d98da..7ad99758ef2 100644
--- a/src/osd/windows/window.c
+++ b/src/osd/windows/window.c
@@ -1346,15 +1346,17 @@ LRESULT CALLBACK winwindow_video_window_proc(HWND wnd, UINT message, WPARAM wpar
 		// syscommands: catch win_start_maximized
 		case WM_SYSCOMMAND:
 		{
+			UINT16 cmd = wparam & 0xfff0;
+			
 			// prevent screensaver or monitor power events
-			if (wparam == SC_MONITORPOWER || wparam == SC_SCREENSAVE)
+			if (cmd == SC_MONITORPOWER || cmd == SC_SCREENSAVE)
 				return 1;
 
 			// most SYSCOMMANDs require us to invalidate the window
 			InvalidateRect(wnd, NULL, FALSE);
 
 			// handle maximize
-			if ((wparam & 0xfff0) == SC_MAXIMIZE)
+			if (cmd == SC_MAXIMIZE)
 			{
 				update_minmax_state(window);
 				if (window->ismaximized)