diff --git a/src/KeyKeeper/Views/RepositoryWindow.axaml.cs b/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
index 1b5cb95..bc3824c 100644
--- a/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
+++ b/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
@@ -37,12 +37,15 @@ public partial class RepositoryWindow : Window
             return;
         }
 
-        if (DataContext is RepositoryWindowViewModel checkVm &&
-            checkVm.CurrentPage is UnlockedRepositoryViewModel unlockedVm &&
-            !unlockedVm.HasUnsavedChanges)
+        if (DataContext is RepositoryWindowViewModel checkVm)
         {
-            allowClose = true;
-            return;
+            if ((checkVm.CurrentPage is UnlockedRepositoryViewModel unlockedVm &&
+                !unlockedVm.HasUnsavedChanges)
+                || checkVm.CurrentPage is LockedRepositoryViewModel)
+            {
+                allowClose = true;
+                return;
+            }
         }
 
         e.Cancel = true;