diff --git a/UI/Popup/DeleteWizard.ts b/UI/Popup/DeleteWizard.ts
index ed999b066e..ff5950aff0 100644
--- a/UI/Popup/DeleteWizard.ts
+++ b/UI/Popup/DeleteWizard.ts
@@ -176,6 +176,13 @@ export default class DeleteWizard extends Toggle {
             undefined,
             isShown
         )
+
+        const self = this
+        confirm.addCallbackAndRunD((dialogIsOpened) => {
+            if (dialogIsOpened) {
+                self.ScrollIntoView()
+            }
+        })
     }
 
     private static constructConfirmButton(
diff --git a/UI/Popup/MoveWizard.ts b/UI/Popup/MoveWizard.ts
index f1a6175905..8a11d97b6d 100644
--- a/UI/Popup/MoveWizard.ts
+++ b/UI/Popup/MoveWizard.ts
@@ -284,5 +284,13 @@ export default class MoveWizard extends Toggle {
             ]).SetClass("flex m-2 p-2 rounded-lg bg-gray-200"),
             moveDisallowedReason.map((r) => r === undefined)
         )
+
+        const self = this
+        currentStep.addCallback((state) => {
+            if (state === "start") {
+                return
+            }
+            self.ScrollIntoView()
+        })
     }
 }