diff --git a/mRemoteV1/Config/Settings/LayoutSettingsSaver.cs b/mRemoteV1/Config/Settings/LayoutSettingsSaver.cs
new file mode 100644
index 00000000..d39314fa
--- /dev/null
+++ b/mRemoteV1/Config/Settings/LayoutSettingsSaver.cs
@@ -0,0 +1,28 @@
+using System;
+using System.IO;
+using mRemoteNG.App;
+using mRemoteNG.App.Info;
+using mRemoteNG.UI.Forms;
+
+namespace mRemoteNG.Config.Settings
+{
+    public class LayoutSettingsSaver
+    {
+        public void Save()
+        {
+            try
+            {
+                if (Directory.Exists(SettingsFileInfo.SettingsPath) == false)
+                {
+                    Directory.CreateDirectory(SettingsFileInfo.SettingsPath);
+                }
+
+                FrmMain.Default.pnlDock.SaveAsXml(SettingsFileInfo.SettingsPath + "\\" + SettingsFileInfo.LayoutFileName);
+            }
+            catch (Exception ex)
+            {
+                Runtime.MessageCollector.AddExceptionStackTrace("SavePanelsToXML failed", ex);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/mRemoteV1/Config/Settings/SettingsSaver.cs b/mRemoteV1/Config/Settings/SettingsSaver.cs
index e9e1b559..85f80493 100644
--- a/mRemoteV1/Config/Settings/SettingsSaver.cs
+++ b/mRemoteV1/Config/Settings/SettingsSaver.cs
@@ -1,8 +1,6 @@
 using System;
-using System.IO;
 using System.Windows.Forms;
 using mRemoteNG.App;
-using mRemoteNG.App.Info;
 using mRemoteNG.Tools;
 using mRemoteNG.UI.Controls;
 using mRemoteNG.UI.Forms;
@@ -60,7 +58,7 @@ namespace mRemoteNG.Config.Settings
                 mRemoteNG.Settings.Default.QuickyTBVisible = quickConnectToolStrip.Visible;
                 mRemoteNG.Settings.Default.Save();
 
-                SavePanelsToXml();
+                new LayoutSettingsSaver().Save();
                 new ExternalAppsSaver().Save(Runtime.ExternalTools);
             }
             catch (Exception ex)
@@ -68,22 +66,5 @@ namespace mRemoteNG.Config.Settings
                 Runtime.MessageCollector.AddExceptionStackTrace("Saving settings failed", ex);
             }
         }
-
-        private static void SavePanelsToXml()
-        {
-            try
-            {
-                if (Directory.Exists(SettingsFileInfo.SettingsPath) == false)
-                {
-                    Directory.CreateDirectory(SettingsFileInfo.SettingsPath);
-                }
-
-                FrmMain.Default.pnlDock.SaveAsXml(SettingsFileInfo.SettingsPath + "\\" + SettingsFileInfo.LayoutFileName);
-            }
-            catch (Exception ex)
-            {
-                Runtime.MessageCollector.AddExceptionStackTrace("SavePanelsToXML failed", ex);
-            }
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj
index 0497a674..9b0bb76b 100644
--- a/mRemoteV1/mRemoteV1.csproj
+++ b/mRemoteV1/mRemoteV1.csproj
@@ -194,6 +194,7 @@
     <Compile Include="Config\Settings\ExternalAppsLoader.cs" />
     <Compile Include="Config\Settings\ExternalAppsSaver.cs" />
     <Compile Include="Config\Settings\LayoutSettingsLoader.cs" />
+    <Compile Include="Config\Settings\LayoutSettingsSaver.cs" />
     <Compile Include="Config\Settings\Providers\AppSettingsProvider.cs" />
     <Compile Include="Config\Settings\Providers\ChooseProvider.cs" />
     <Compile Include="Config\Settings\SettingsLoader.cs" />