diff --git a/src/KeyKeeper/AboutWindow.cs b/src/KeyKeeper/AboutWindow.cs
index 4a17046..b082668 100644
--- a/src/KeyKeeper/AboutWindow.cs
+++ b/src/KeyKeeper/AboutWindow.cs
@@ -12,6 +12,9 @@ public class AboutWindow : Window
         this.Width = 600;
         this.Height = 400;
 
+        this.MinWidth = 450;
+        this.MinHeight = 250;
+
         this.Background = new SolidColorBrush(Color.Parse("#2328c4"));
 
         var AboutKeyKeeper = new TextBlock
diff --git a/src/KeyKeeper/SettingsWindow.cs b/src/KeyKeeper/SettingsWindow.cs
index 1c24b2a..3f0911f 100644
--- a/src/KeyKeeper/SettingsWindow.cs
+++ b/src/KeyKeeper/SettingsWindow.cs
@@ -8,6 +8,8 @@ public class SettingsWindow : Window
     public SettingsWindow()
     {
         this.Title = "Settings";
+        this.MinWidth = 500;
+        this.MinHeight = 400;
         this.Width = 400;
         this.Height = 300;
         var textBlock = new TextBlock
diff --git a/src/KeyKeeper/Views/CreateVaultDialog.axaml.cs b/src/KeyKeeper/Views/CreateVaultDialog.axaml.cs
index 4f908ab..1cc2af1 100644
--- a/src/KeyKeeper/Views/CreateVaultDialog.axaml.cs
+++ b/src/KeyKeeper/Views/CreateVaultDialog.axaml.cs
@@ -16,6 +16,8 @@ namespace KeyKeeper.Views
         public CreateVaultFileWindow()
         {
             InitializeComponent();
+            MinWidth = 450;
+            MinHeight = 350;
 #if DEBUG
             this.AttachDevTools();
 #endif
diff --git a/src/KeyKeeper/Views/EntryEditWindow.axaml.cs b/src/KeyKeeper/Views/EntryEditWindow.axaml.cs
index 0fbea55..f03d76e 100644
--- a/src/KeyKeeper/Views/EntryEditWindow.axaml.cs
+++ b/src/KeyKeeper/Views/EntryEditWindow.axaml.cs
@@ -16,6 +16,10 @@ public partial class EntryEditWindow : Window
     public EntryEditWindow()
     {
         InitializeComponent();
+
+        MinWidth = 500;
+        MinHeight = 400;
+
         if (PasswordEdit != null)
         {
             PasswordEdit.TextChanged += PasswordTextChanged;
diff --git a/src/KeyKeeper/Views/ErrorDialog.axaml.cs b/src/KeyKeeper/Views/ErrorDialog.axaml.cs
index 46e9306..ef17520 100644
--- a/src/KeyKeeper/Views/ErrorDialog.axaml.cs
+++ b/src/KeyKeeper/Views/ErrorDialog.axaml.cs
@@ -8,6 +8,8 @@ public partial class ErrorDialog : Window
     public ErrorDialog(string message)
     {
         InitializeComponent();
+        MinWidth = 400;
+        MinHeight = 200;
         MessageText.Text = message;
     }
 
diff --git a/src/KeyKeeper/Views/MainWindow.axaml.cs b/src/KeyKeeper/Views/MainWindow.axaml.cs
index ee8549a..95c4bad 100644
--- a/src/KeyKeeper/Views/MainWindow.axaml.cs
+++ b/src/KeyKeeper/Views/MainWindow.axaml.cs
@@ -18,6 +18,8 @@ namespace KeyKeeper.Views
         public MainWindow()
         {
             InitializeComponent();
+            this.MinWidth = 550;
+            this.MinHeight = 350;
         }
 
         private async void CreateNewVault_Click(object sender, RoutedEventArgs e)
@@ -80,8 +82,7 @@ namespace KeyKeeper.Views
             {
                 WindowStartupLocation = WindowStartupLocation.CenterScreen
             };
-
-            repositoryWindow.Closed += (s, e) => this.Show();
+            repositoryWindow.Closed += (s, e) => this.Close();
             repositoryWindow.Show();
             this.Hide();
         }
diff --git a/src/KeyKeeper/Views/RepositoryWindow.axaml.cs b/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
index 6e39894..caa768f 100644
--- a/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
+++ b/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
@@ -18,6 +18,10 @@ public partial class RepositoryWindow : Window
     public RepositoryWindow(RepositoryWindowViewModel model)
     {
         InitializeComponent();
+
+        MinWidth = 650;
+        MinHeight = 500;
+
         DataContext = model;
         model.ShowErrorPopup = async (string message) =>
         {