diff --git a/app/streaming/input.cpp b/app/streaming/input.cpp
index e4996c36..88ec60a3 100644
--- a/app/streaming/input.cpp
+++ b/app/streaming/input.cpp
@@ -426,9 +426,11 @@ void SdlInputHandler::handleMouseButtonEvent(SDL_MouseButtonEvent* event)
             button = BUTTON_RIGHT;
             break;
         case SDL_BUTTON_X1:
+            button = BUTTON_X1;
+            break;
         case SDL_BUTTON_X2:
-            // Unsupported by GameStream
-            return;
+            button = BUTTON_X2;
+            break;
         default:
             SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
                         "Unhandled button event: %d",
diff --git a/moonlight-common-c/moonlight-common-c b/moonlight-common-c/moonlight-common-c
index 487a62f5..558ba488 160000
--- a/moonlight-common-c/moonlight-common-c
+++ b/moonlight-common-c/moonlight-common-c
@@ -1 +1 @@
-Subproject commit 487a62f58ce79a4ff455129e0dfcd2ee9da30dd0
+Subproject commit 558ba488e8eb7a614b6d9a93968c7c69683f942d