diff --git a/src/KeyKeeper/Views/RepositoryWindow.axaml.cs b/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
index a12b662..6e39894 100644
--- a/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
+++ b/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
@@ -118,8 +118,13 @@ public partial class RepositoryWindow : Window
 
             EntryEditWindow dialog = new();
             dialog.SetEntry(selectedEntry);
+
+            vm_.StopLockTimer();
+
             await dialog.ShowDialog(this);
 
+            vm_.StartLockTimer();
+
             if (dialog.EditedEntry != null)
             {
                 vm.UpdateEntry(dialog.EditedEntry);
@@ -165,7 +170,9 @@ public partial class RepositoryWindow : Window
                 {
                     EntryEditWindow dialog = new();
                     dialog.SetEntry(pwd);
+                    vm.StopLockTimer();
                     await dialog.ShowDialog(this);
+                    vm.StartLockTimer();
                     if (dialog.EditedEntry != null)
                     {
                         pageVm.UpdateEntry(dialog.EditedEntry);