diff --git a/DS4Windows/DS4Forms/KBM360.cs b/DS4Windows/DS4Forms/KBM360.cs
index 01b270e..890fdc9 100644
--- a/DS4Windows/DS4Forms/KBM360.cs
+++ b/DS4Windows/DS4Forms/KBM360.cs
@@ -39,6 +39,7 @@ namespace DS4Windows.Forms
             //pnl360Controls.BackgroundImage = null;
             //pnl360Controls.BackgroundImageLayout = ImageLayout.None;
             use360 = true;
+            device = deviceNum;
             pnl360Controls.Paint -= pnl360Controls_Paint;
             if (Global.outDevTypeTemp[device] == OutContType.DS4)
             {
@@ -49,7 +50,6 @@ namespace DS4Windows.Forms
                 pnlDS4Controls.Show();
             }
 
-            device = deviceNum;
             ops = ooo;
             button = buton;
             DS4ControlSettings dcs = Global.getDS4CSetting(device, button.Name);
diff --git a/DS4Windows/DS4Forms/Options.cs b/DS4Windows/DS4Forms/Options.cs
index 55e8c95..d6795b5 100644
--- a/DS4Windows/DS4Forms/Options.cs
+++ b/DS4Windows/DS4Forms/Options.cs
@@ -1005,6 +1005,7 @@ namespace DS4Windows.Forms
                 if (idxSASteeringWheelEmulationRange >= 0) cBSteeringWheelEmulationRange.SelectedIndex = idxSASteeringWheelEmulationRange;
 
                 OutContType tempOutType = Global.OutContType[device];
+                Global.outDevTypeTemp[device] = tempOutType;
                 devOutContType = tempOutType;
                 switch(tempOutType)
                 {
@@ -1190,6 +1191,8 @@ namespace DS4Windows.Forms
                 gyroMStickUseSmoothCk.Checked = false;
                 gyroMStickSmoothWeightNUD.Enabled = false;
                 gyroMStickSmoothWeightNUD.Value = 0.5m;
+                Global.outDevTypeTemp[device] = OutContType.X360;
+                devOutContType = OutContType.X360;
 
                 Set();
             }
@@ -3638,6 +3641,7 @@ namespace DS4Windows.Forms
                     default: break;
                 }
 
+                Global.outDevTypeTemp[device] = tempType;
                 devOutContType = tempType;
                 UpdateLists();
             }