diff --git a/src/client/input/sdl2.c b/src/client/input/sdl2.c
index bc733ddb..992d1a88 100644
--- a/src/client/input/sdl2.c
+++ b/src/client/input/sdl2.c
@@ -236,10 +236,17 @@ IN_TranslateSDLtoQ2Key(unsigned int keysym)
 		case SDLK_BACKSPACE:
 			key = K_BACKSPACE;
 			break;
-		case SDLK_LGUI:
+#ifdef __APPLE__
 		case SDLK_RGUI:
-			key = K_COMMAND; // Win key
+		case SDLK_LGUI:
+			key = K_COMMAND;
 			break;
+#else
+		case SDLK_RGUI:
+		case SDLK_LGUI:
+			key = K_SUPER;
+			break;
+#endif
 		case SDLK_CAPSLOCK:
 			key = K_CAPSLOCK;
 			break;
@@ -395,8 +402,6 @@ IN_TranslateSDLtoQ2Key(unsigned int keysym)
 			key = K_KP_EQUALS;
 			break;
 
-		// TODO: K_SUPER ? Win Key is already K_COMMAND
-
 		case SDLK_APPLICATION:
 			key = K_COMPOSE;
 			break;
@@ -663,7 +668,7 @@ IN_Update(void)
 					event.window.event == SDL_WINDOWEVENT_FOCUS_GAINED)
 				{
 					Key_MarkAllUp();
-					
+
 					if (event.window.event == SDL_WINDOWEVENT_FOCUS_LOST)
 					{
 						S_Activate(false);
diff --git a/src/client/input/sdl3.c b/src/client/input/sdl3.c
index e719b975..a4dc39ae 100644
--- a/src/client/input/sdl3.c
+++ b/src/client/input/sdl3.c
@@ -226,10 +226,17 @@ IN_TranslateSDLtoQ2Key(unsigned int keysym)
 		case SDLK_BACKSPACE:
 			key = K_BACKSPACE;
 			break;
-		case SDLK_LGUI:
+#ifdef __APPLE__
 		case SDLK_RGUI:
-			key = K_COMMAND; // Win key
+		case SDLK_LGUI:
+			key = K_COMMAND;
 			break;
+#else
+		case SDLK_RGUI:
+		case SDLK_LGUI:
+			key = K_SUPER;
+			break;
+#endif
 		case SDLK_CAPSLOCK:
 			key = K_CAPSLOCK;
 			break;
@@ -385,8 +392,6 @@ IN_TranslateSDLtoQ2Key(unsigned int keysym)
 			key = K_KP_EQUALS;
 			break;
 
-		// TODO: K_SUPER ? Win Key is already K_COMMAND
-
 		case SDLK_APPLICATION:
 			key = K_COMPOSE;
 			break;