diff --git a/Falcon BMS Alternative Launcher/Windows/AxisAssignWindow.xaml.cs b/Falcon BMS Alternative Launcher/Windows/AxisAssignWindow.xaml.cs
index 02b1033..624da0f 100644
--- a/Falcon BMS Alternative Launcher/Windows/AxisAssignWindow.xaml.cs	
+++ b/Falcon BMS Alternative Launcher/Windows/AxisAssignWindow.xaml.cs	
@@ -17,6 +17,8 @@ public AxisAssignWindow(MainWindow mainWindow, InGameAxAssgn axisAssign, object
         {
             InitializeComponent();
 
+            this.Owner = mainWindow;
+
             this.mainWindow = mainWindow;
             this.axisAssign = axisAssign;
 
@@ -436,10 +438,6 @@ private void Save_Click(object sender, RoutedEventArgs e)
             AxisDetectionTimer.Stop();
             sw.Stop();
 
-            // Save the XML and Key files, after each change user makes.
-            MainWindow.deviceControl.SaveXml();
-            Program.mainWin.appReg.getOverrideWriter().SaveKeyMapping(MainWindow.inGameAxis, MainWindow.deviceControl);
-
             Close();
         }
 
diff --git a/Falcon BMS Alternative Launcher/Windows/MainWindowAxisAssign.cs b/Falcon BMS Alternative Launcher/Windows/MainWindowAxisAssign.cs
index deffc25..d1c8f8f 100644
--- a/Falcon BMS Alternative Launcher/Windows/MainWindowAxisAssign.cs	
+++ b/Falcon BMS Alternative Launcher/Windows/MainWindowAxisAssign.cs	
@@ -360,6 +360,10 @@ private void Assign_Click(object sender, RoutedEventArgs e)
             joyAssign_2_inGameAxis();
             ResetAssgnWindow();
 
+            // Save the XML and Key files, after each change user makes.
+            MainWindow.deviceControl.SaveXml();
+            this.appReg.getOverrideWriter().SaveKeyMapping(MainWindow.inGameAxis, MainWindow.deviceControl);
+
             NewDeviceDetectTimer.Start();
             AxisMovingTimer.Start();
         }