diff --git a/forge-gui-desktop/src/main/java/forge/view/FDialog.java b/forge-gui-desktop/src/main/java/forge/view/FDialog.java
index 75f0fb75d08..b66c2215679 100644
--- a/forge-gui-desktop/src/main/java/forge/view/FDialog.java
+++ b/forge-gui-desktop/src/main/java/forge/view/FDialog.java
@@ -2,6 +2,7 @@ package forge.view;
 
 import forge.Singletons;
 import forge.assets.FSkinProp;
+import forge.match.input.InputBase;
 import forge.toolbox.FMouseAdapter;
 import forge.toolbox.FPanel;
 import forge.toolbox.FSkin;
@@ -129,6 +130,7 @@ public class FDialog extends SkinnedDialog implements ITitleBarOwner, KeyEventDi
 
         if (visible) {
             FMouseAdapter.forceMouseUp(); //ensure mouse up handled if dialog shown between mouse down and mouse up
+            InputBase.cancelAwaitNextInput(); //ensure "Waiting for opponent..." prompt doesn't appear while dialog awaiting input
 
             if (openModals.isEmpty()) {
                 setLocationRelativeTo(JOptionPane.getRootFrame());
diff --git a/forge-gui-mobile/src/forge/toolbox/FDialog.java b/forge-gui-mobile/src/forge/toolbox/FDialog.java
index 83d06913099..32910037436 100644
--- a/forge-gui-mobile/src/forge/toolbox/FDialog.java
+++ b/forge-gui-mobile/src/forge/toolbox/FDialog.java
@@ -9,6 +9,7 @@ import forge.assets.FSkinFont;
 import forge.assets.FSkinImage;
 import forge.assets.FSkinTexture;
 import forge.assets.FSkinColor.Colors;
+import forge.match.input.InputBase;
 import forge.screens.FScreen;
 import forge.util.Utils;
 
@@ -57,6 +58,7 @@ public abstract class FDialog extends FOverlay {
 
         if (visible0) {
             openDialogCount++;
+            InputBase.cancelAwaitNextInput(); //ensure "Waiting for opponent..." prompt doesn't appear while dialog awaiting input
         }
         else if (openDialogCount > 0) {
             openDialogCount--;