diff --git a/Zetris.PPT/PPTBot.cs b/Zetris.PPT/PPTBot.cs
index 8290707..4961d3d 100644
--- a/Zetris.PPT/PPTBot.cs
+++ b/Zetris.PPT/PPTBot.cs
@@ -238,6 +238,8 @@ void runLogic() {
 
                     useEngineFrames();
                     refreshEngineTimeout();
+
+                    RestoreManual();
                 }
 
                 current = GameHelper.Instance.getCurrentPiece.Call(playerID);
@@ -730,7 +732,7 @@ public void RestoreManual() {
 
             doingManualInput = false;
 
-            Dispatcher.CurrentDispatcher.Invoke(() => {
+            Window?.Dispatcher.InvokeAsync(() => {
                 if (_btn != null) _btn.MaxHeight = 0;
             });
         }