diff --git a/src/KeyKeeper/Views/MainWindow.axaml.cs b/src/KeyKeeper/Views/MainWindow.axaml.cs
index 3e0a731..7ac09d4 100644
--- a/src/KeyKeeper/Views/MainWindow.axaml.cs
+++ b/src/KeyKeeper/Views/MainWindow.axaml.cs
@@ -82,9 +82,19 @@ namespace KeyKeeper.Views
             {
                 WindowStartupLocation = WindowStartupLocation.CenterScreen
             };
-            repositoryWindow.Closed += (s, e) => this.Close();
+            repositoryWindow.Closed += (s, e) =>
+            {
+                if (AppSettings.ExitOnRepositoryClose)
+                {
+                    this.Close();
+                }
+                else
+                {
+                    this.Show();
+                }
+            };
             repositoryWindow.Show();
-            this.Hide();
+            this.Hide(); 
         }
     }
 }