diff --git a/BetterJoyForCemu/App.config b/BetterJoyForCemu/App.config
index b665913..d04ed55 100644
--- a/BetterJoyForCemu/App.config
+++ b/BetterJoyForCemu/App.config
@@ -119,6 +119,10 @@
         <!-- Default: true -->
         <add key="HomeLongPowerOff" value="true" />
 
+        <!-- Double click sticks on joycons (L3, R3) to change joycon orientation -->
+        <!-- Default: true -->
+        <add key="ChangeOrientationDoubleClick" value="true" />
+
         <!-- Determines what type of debugging information to be printed -->
         <!-- None = 0 -->
         <!-- All = 1 -->
diff --git a/BetterJoyForCemu/Joycon.cs b/BetterJoyForCemu/Joycon.cs
index ef6b84f..3290f02 100644
--- a/BetterJoyForCemu/Joycon.cs
+++ b/BetterJoyForCemu/Joycon.cs
@@ -682,6 +682,9 @@ namespace BetterJoyForCemu {
         bool HomeLongPowerOff = Boolean.Parse(ConfigurationManager.AppSettings["HomeLongPowerOff"]);
         long PowerOffInactivityMins = Int32.Parse(ConfigurationManager.AppSettings["PowerOffInactivity"]);
 
+        bool ChangeOrientationDoubleClick = Boolean.Parse(ConfigurationManager.AppSettings["ChangeOrientationDoubleClick"]);
+        long lastDoubleClick = -1;
+
         string extraGyroFeature = ConfigurationManager.AppSettings["GyroToJoyOrMouse"];
         int GyroMouseSensitivityX = Int32.Parse(ConfigurationManager.AppSettings["GyroMouseSensitivityX"]);
         int GyroMouseSensitivityY = Int32.Parse(ConfigurationManager.AppSettings["GyroMouseSensitivityY"]);
@@ -689,6 +692,7 @@ namespace BetterJoyForCemu {
         bool GyroAnalogSliders = Boolean.Parse(ConfigurationManager.AppSettings["GyroAnalogSliders"]);
         int GyroAnalogSensitivity = Int32.Parse(ConfigurationManager.AppSettings["GyroAnalogSensitivity"]);
         byte[] sliderVal = new byte[] { 0, 0 };
+
         private void DoThingsWithButtons() {
             int powerOffButton = (int)((isPro || !isLeft || other != null) ? Button.HOME : Button.CAPTURE);
 
@@ -703,6 +707,18 @@ namespace BetterJoyForCemu {
                 }
             }
 
+            if (ChangeOrientationDoubleClick && buttons_down[(int)Button.STICK] && lastDoubleClick != -1 && !isPro) {
+                if ((buttons_down_timestamp[(int)Button.STICK] - lastDoubleClick) < 3000000) {
+                    form.conBtnClick(form.con[PadId], EventArgs.Empty); // trigger connection button click
+
+                    lastDoubleClick = buttons_down_timestamp[(int)Button.STICK];
+                    return;
+                }
+                lastDoubleClick = buttons_down_timestamp[(int)Button.STICK];
+            } else if (ChangeOrientationDoubleClick && buttons_down[(int)Button.STICK] && !isPro) {
+                lastDoubleClick = buttons_down_timestamp[(int)Button.STICK];
+            }
+
             if (PowerOffInactivityMins > 0) {
                 if ((timestamp - inactivity) / 10000 > PowerOffInactivityMins * 60 * 1000) {
                     if (other != null)