diff --git a/Ryujinx.Core/Hid/Hid.cs b/Ryujinx.Core/Hid/Hid.cs
index f25a9437..48f309d8 100644
--- a/Ryujinx.Core/Hid/Hid.cs
+++ b/Ryujinx.Core/Hid/Hid.cs
@@ -219,7 +219,7 @@ namespace Ryujinx.Core.Input
                     Memory.WriteInt64Unchecked(TouchScreenOffset + 0x8,  HidEntryCount);
                     Memory.WriteInt64Unchecked(TouchScreenOffset + 0x10, CurrEntry);
                     Memory.WriteInt64Unchecked(TouchScreenOffset + 0x18, HidEntryCount - 1);
-                    Memory.WriteInt64Unchecked(TouchScreenOffset + 0x20, Timestamp);            
+                    Memory.WriteInt64Unchecked(TouchScreenOffset + 0x20, Timestamp);
 
                     long TouchEntryOffset = TouchScreenOffset + HidTouchHeaderSize;
 
diff --git a/Ryujinx/Ui/GLScreen.cs b/Ryujinx/Ui/GLScreen.cs
index 49338247..8ccbebfa 100644
--- a/Ryujinx/Ui/GLScreen.cs
+++ b/Ryujinx/Ui/GLScreen.cs
@@ -154,6 +154,13 @@ namespace Ryujinx
                 Ns.Hid.SetTouchPoints();
             }
 
+            Ns.Hid.SetJoyconButton(
+                HidControllerId.CONTROLLER_HANDHELD,
+                HidControllerLayouts.Handheld_Joined,
+                CurrentButton,
+                LeftJoystick,
+                RightJoystick);
+
             Ns.Hid.SetJoyconButton(
                 HidControllerId.CONTROLLER_HANDHELD,
                 HidControllerLayouts.Main,