diff --git a/src/main/java/forge/game/MatchController.java b/src/main/java/forge/game/MatchController.java
index 76f086d8db3..23901a41148 100644
--- a/src/main/java/forge/game/MatchController.java
+++ b/src/main/java/forge/game/MatchController.java
@@ -162,10 +162,12 @@ public class MatchController {
             
             getInput().clearInput();
             getInput().resetInput();
+            getInput().setNewInput(currentGame);
             
-            Thread thGame = new GameInputUpdatesThread(this, currentGame);
-            thGame.setName("Game input updater");
-            thGame.start();
+            
+//            Thread thGame = new GameInputUpdatesThread(this, currentGame);
+//            thGame.setName("Game input updater");
+//            thGame.start();
 
             // TODO restore this functionality!!!
             //VMatchUI.SINGLETON_INSTANCE.getViewDevMode().getDocument().setVisible(Preferences.DEV_MODE);
diff --git a/src/main/java/forge/gui/InputProxy.java b/src/main/java/forge/gui/InputProxy.java
index 62ff85927e7..c186c935348 100644
--- a/src/main/java/forge/gui/InputProxy.java
+++ b/src/main/java/forge/gui/InputProxy.java
@@ -21,6 +21,7 @@ import java.util.Observable;
 import java.util.Observer;
 
 import forge.Card;
+import forge.Singletons;
 import forge.control.input.Input;
 import forge.game.player.Player;
 import forge.game.zone.PlayerZone;
@@ -44,6 +45,8 @@ public class InputProxy implements Observer {
     public final synchronized void update(final Observable observable, final Object obj) {
         ButtonUtil.disableAll();
         valid = false;
+        
+        Singletons.getModel().getMatch().getInput().setNewInput(Singletons.getModel().getGame());
     }
     /**
      * <p>