diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java b/forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java
index 74dcef0ad06..2bf506da986 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java
@@ -365,7 +365,7 @@ public class TargetingOverlay {
         @Override
         public void paintComponent(final Graphics g) {
             // No need for this except in match view
-            if (!Singletons.getControl().getCurrentScreen().isMatchScreen()) {
+            if (Singletons.getControl().getCurrentScreen() != matchUI.getScreen()) {
                 return;
             }