diff --git a/src/Views/ConfigureWorkspace.axaml.cs b/src/Views/ConfigureWorkspace.axaml.cs
index 012c2e85..9e458f6f 100644
--- a/src/Views/ConfigureWorkspace.axaml.cs
+++ b/src/Views/ConfigureWorkspace.axaml.cs
@@ -11,8 +11,10 @@ namespace SourceGit.Views
 
         protected override void OnClosing(WindowClosingEventArgs e)
         {
-            ViewModels.Preferences.Instance.Save();
             base.OnClosing(e);
+
+            if (!Design.IsDesignMode)
+                ViewModels.Preferences.Instance.Save();
         }
     }
 }
diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index b8c09b35..9ccec78c 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -273,8 +273,10 @@ namespace SourceGit.Views
 
         protected override void OnClosing(WindowClosingEventArgs e)
         {
-            (DataContext as ViewModels.Launcher)?.Quit(Width, Height);
             base.OnClosing(e);
+
+            if (!Design.IsDesignMode && DataContext is ViewModels.Launcher launcher)
+                launcher.Quit(Width, Height);
         }
 
         private void OnOpenWorkspaceMenu(object sender, RoutedEventArgs e)
diff --git a/src/Views/Preferences.axaml.cs b/src/Views/Preferences.axaml.cs
index 324d2375..73b2e995 100644
--- a/src/Views/Preferences.axaml.cs
+++ b/src/Views/Preferences.axaml.cs
@@ -169,6 +169,11 @@ namespace SourceGit.Views
 
         protected override void OnClosing(WindowClosingEventArgs e)
         {
+            base.OnClosing(e);
+
+            if (Design.IsDesignMode)
+                return;
+
             var config = new Commands.Config(null).ListAll();
             SetIfChanged(config, "user.name", DefaultUser, "");
             SetIfChanged(config, "user.email", DefaultEmail, "");
@@ -199,7 +204,6 @@ namespace SourceGit.Views
             }
 
             ViewModels.Preferences.Instance.Save();
-            base.OnClosing(e);
         }
 
         private async void SelectThemeOverrideFile(object _, RoutedEventArgs e)
diff --git a/src/Views/RepositoryConfigure.axaml.cs b/src/Views/RepositoryConfigure.axaml.cs
index 3faba5ee..455731aa 100644
--- a/src/Views/RepositoryConfigure.axaml.cs
+++ b/src/Views/RepositoryConfigure.axaml.cs
@@ -13,8 +13,10 @@ namespace SourceGit.Views
 
         protected override void OnClosing(WindowClosingEventArgs e)
         {
-            (DataContext as ViewModels.RepositoryConfigure)?.Save();
             base.OnClosing(e);
+
+            if (!Design.IsDesignMode && DataContext is ViewModels.RepositoryConfigure configure)
+                configure.Save();
         }
 
         private async void SelectExecutableForCustomAction(object sender, RoutedEventArgs e)
diff --git a/src/Views/WorkingCopy.axaml.cs b/src/Views/WorkingCopy.axaml.cs
index dfaad858..4ae4d779 100644
--- a/src/Views/WorkingCopy.axaml.cs
+++ b/src/Views/WorkingCopy.axaml.cs
@@ -1,7 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
-using Avalonia.VisualTree;
 
 namespace SourceGit.Views
 {