diff --git a/src/main/java/forge/control/match/ControlField.java b/src/main/java/forge/control/match/ControlField.java
index bb30edfeab0..8a1fcca94b5 100644
--- a/src/main/java/forge/control/match/ControlField.java
+++ b/src/main/java/forge/control/match/ControlField.java
@@ -166,17 +166,17 @@ public class ControlField {
             this.view.getLblLibrary().enableHover();
             this.view.getLblLibrary().removeMouseListener(maLibrary);
             this.view.getLblLibrary().addMouseListener(maLibrary);
+
+            // Hand button
+            this.view.getLblHand().enableHover();
+            this.view.getLblHand().removeMouseListener(maHand);
+            this.view.getLblHand().addMouseListener(maHand);
         }
 
         // Flashback card list button
         this.view.getLblFlashback().enableHover();
         this.view.getLblFlashback().removeMouseListener(maFlashback);
         this.view.getLblFlashback().addMouseListener(maFlashback);
-
-        // Hand button
-        this.view.getLblHand().enableHover();
-        this.view.getLblHand().removeMouseListener(maHand);
-        this.view.getLblHand().addMouseListener(maHand);
     }
 
     /**