diff --git a/src/KeyKeeper/ViewModels/RepositoryWindowViewModel.cs b/src/KeyKeeper/ViewModels/RepositoryWindowViewModel.cs
index 4db29c9..77d810b 100644
--- a/src/KeyKeeper/ViewModels/RepositoryWindowViewModel.cs
+++ b/src/KeyKeeper/ViewModels/RepositoryWindowViewModel.cs
@@ -64,7 +64,7 @@ public partial class RepositoryWindowViewModel : ViewModelBase
         CurrentPage = new LockedRepositoryViewModel(passStore, this);
     }
 
-    private void StartLockTimer()
+    public void StartLockTimer()
     {
         StopLockTimer();
         _timerStart = DateTime.UtcNow;
@@ -77,7 +77,7 @@ public partial class RepositoryWindowViewModel : ViewModelBase
         UpdateTimerDisplay();
     }
 
-    private void StopLockTimer()
+    public void StopLockTimer()
     {
         if (_lockTimer != null)
         {
diff --git a/src/KeyKeeper/Views/RepositoryWindow.axaml.cs b/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
index 227c950..ffdc527 100644
--- a/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
+++ b/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
@@ -41,8 +41,13 @@ public partial class RepositoryWindow : Window
         if (DataContext is RepositoryWindowViewModel vm_ && vm_.CurrentPage is UnlockedRepositoryViewModel vm)
         {
             EntryEditWindow dialog = new();
+
+            vm_.StopLockTimer();
+
             await dialog.ShowDialog(this);
 
+            vm_.StartLockTimer();
+
             if (dialog.EditedEntry != null)
                 vm.AddEntry(dialog.EditedEntry);
         }