diff --git a/src/video/windib/SDL_dibevents.c b/src/video/windib/SDL_dibevents.c
index 235a63109..4b953dda9 100644
--- a/src/video/windib/SDL_dibevents.c
+++ b/src/video/windib/SDL_dibevents.c
@@ -82,7 +82,13 @@ LONG
 					break;
 				case VK_SHIFT:
 					/* EXTENDED trick doesn't work here */
-					wParam = VK_LSHIFT;
+					if ( GetKeyState(VK_LSHIFT) & 0x8000 ) {
+						wParam = VK_LSHIFT;
+					} else if ( GetKeyState(VK_RSHIFT) & 0x8000 ) {
+						wParam = VK_RSHIFT;
+					} else {
+						/* Huh? */
+					}
 					break;
 				case VK_MENU:
 					if ( lParam&EXTENDED_KEYMASK )