diff --git a/sunshine/platform/linux/input.cpp b/sunshine/platform/linux/input.cpp
index ad3397d5..78e08024 100644
--- a/sunshine/platform/linux/input.cpp
+++ b/sunshine/platform/linux/input.cpp
@@ -290,8 +290,8 @@ uint16_t keysym(uint16_t modcode) {
     return XK_Control_R;
   case 0xA4:
     return XK_Alt_L;
-  case 0xA5: /* return XK_Alt_R; */
-    return XK_Super_L;
+  case 0xA5:
+    return XK_Alt_R;
   case 0x5B:
     return XK_Super_L;
   case 0x5C:
diff --git a/sunshine/platform/windows/input.cpp b/sunshine/platform/windows/input.cpp
index 6889de00..215a38a5 100755
--- a/sunshine/platform/windows/input.cpp
+++ b/sunshine/platform/windows/input.cpp
@@ -201,10 +201,6 @@ void scroll(input_t &input, int distance) {
 }
 
 void keyboard(input_t &input, uint16_t modcode, bool release) {
-  if(modcode == VK_RMENU) {
-    modcode = VK_LWIN;
-  }
-
   INPUT i {};
   i.type   = INPUT_KEYBOARD;
   auto &ki = i.ki;