diff --git a/src/main/java/forge/control/home/ControlConstructed.java b/src/main/java/forge/control/home/ControlConstructed.java
index f2aec532cfe..45294399df1 100644
--- a/src/main/java/forge/control/home/ControlConstructed.java
+++ b/src/main/java/forge/control/home/ControlConstructed.java
@@ -4,6 +4,7 @@ import java.awt.Toolkit;
 import java.awt.datatransfer.StringSelection;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -48,7 +49,7 @@ public class ControlConstructed {
     private final Map<String, String> colorVals;
     private List<String> themeNames;
     private List<String> deckNames;
-    private final MouseAdapter madStartGame, madDecksAI, madDecksHuman,
+    private final MouseListener madStartGame, madDecksAI, madDecksHuman,
         madHumanRandomDeck, madAIRandomDeck, madHumanRandomTheme, madAIRandomTheme;
 
     /**
diff --git a/src/main/java/forge/control/home/ControlDraft.java b/src/main/java/forge/control/home/ControlDraft.java
index 0a3b5da8686..6410ccd4c7c 100644
--- a/src/main/java/forge/control/home/ControlDraft.java
+++ b/src/main/java/forge/control/home/ControlDraft.java
@@ -2,6 +2,7 @@ package forge.control.home;
 
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -28,7 +29,7 @@ import forge.view.toolbox.FSkin;
  */
 public class ControlDraft {
     private final ViewDraft view;
-    private final MouseAdapter madBuildDeck, madDirections, madStartGame;
+    private final MouseListener madBuildDeck, madDirections, madStartGame;
 
     /** @param v0 &emsp; ViewDraft */
     public ControlDraft(ViewDraft v0) {
diff --git a/src/main/java/forge/control/home/ControlQuest.java b/src/main/java/forge/control/home/ControlQuest.java
index 72dd887b5b9..87e6fd0fd83 100644
--- a/src/main/java/forge/control/home/ControlQuest.java
+++ b/src/main/java/forge/control/home/ControlQuest.java
@@ -4,6 +4,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.io.File;
 import java.io.FilenameFilter;
 import java.util.HashMap;
@@ -51,7 +52,7 @@ public class ControlQuest {
     private QuestEventManager qem;
     private JPanel selectedTab;
 
-    private final MouseAdapter madStartGame, madDuels, madChallenges,
+    private final MouseListener madStartGame, madDuels, madChallenges,
         madQuests, madDecks, madPreferences;
     private final ActionListener actPetSelect, actPlantSelect;
     private final Command cmdSpellShop, cmdBazaar,
diff --git a/src/main/java/forge/control/home/ControlSealed.java b/src/main/java/forge/control/home/ControlSealed.java
index 6b72198a618..c0ea051df46 100644
--- a/src/main/java/forge/control/home/ControlSealed.java
+++ b/src/main/java/forge/control/home/ControlSealed.java
@@ -2,6 +2,7 @@ package forge.control.home;
 
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -11,7 +12,6 @@ import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 
 import net.slightlymagic.braids.util.UtilFunctions;
-
 import forge.AllZone;
 import forge.Command;
 import forge.Constant;
@@ -38,7 +38,7 @@ public class ControlSealed {
     private ViewSealed view;
     private DeckManager deckManager;
     private Map<String, Deck> aiDecks;
-    private final MouseAdapter madBuildDeck, madStartGame;
+    private final MouseListener madBuildDeck, madStartGame;
 
     /**
      * Controls behavior of swing components in "sealed" mode menu.
diff --git a/src/main/java/forge/control/home/ControlUtilities.java b/src/main/java/forge/control/home/ControlUtilities.java
index b939fba5ac7..0d8046a61cb 100644
--- a/src/main/java/forge/control/home/ControlUtilities.java
+++ b/src/main/java/forge/control/home/ControlUtilities.java
@@ -2,6 +2,7 @@ package forge.control.home;
 
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 
 import javax.swing.JOptionPane;
 import javax.swing.JScrollPane;
@@ -28,7 +29,7 @@ import forge.view.toolbox.FSkin;
  */
 public class ControlUtilities {
     private ViewUtilities view;
-    private final MouseAdapter madLicensing;
+    private final MouseListener madLicensing;
     private final Command cmdDeckEditor, cmdPicDownload, cmdSetDownload,
         cmdQuestImages, cmdReportBug, cmdImportPictures, cmdHowToPlay, cmdDownloadPrices;
 
diff --git a/src/main/java/forge/control/match/ControlField.java b/src/main/java/forge/control/match/ControlField.java
index 3734e66a1fa..732be2fe280 100644
--- a/src/main/java/forge/control/match/ControlField.java
+++ b/src/main/java/forge/control/match/ControlField.java
@@ -20,7 +20,9 @@ package forge.control.match;
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionAdapter;
+import java.awt.event.MouseMotionListener;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Observable;
@@ -69,8 +71,8 @@ public class ControlField {
     private final Player player;
     private final ViewField view;
 
-    private MouseMotionAdapter maCardOver;
-    private MouseAdapter maAvatar, maLibrary, maHand, maExiled, maGraveyard, maFlashback, maCardClick;
+    private MouseMotionListener maCardOver;
+    private MouseListener maAvatar, maLibrary, maHand, maExiled, maGraveyard, maFlashback, maCardClick;
 
     private MouseAdapter maBlack, maBlue, maGreen, maRed, maWhite, maColorless;
 
diff --git a/src/main/java/forge/control/match/ControlHand.java b/src/main/java/forge/control/match/ControlHand.java
index c8104581f6f..423c5f10760 100644
--- a/src/main/java/forge/control/match/ControlHand.java
+++ b/src/main/java/forge/control/match/ControlHand.java
@@ -21,7 +21,9 @@ import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionAdapter;
+import java.awt.event.MouseMotionListener;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -39,8 +41,8 @@ import forge.Card;
 import forge.Constant.Zone;
 import forge.PlayerZone;
 import forge.view.GuiTopLevel;
-import forge.view.match.ViewHand;
 import forge.view.match.MatchTopLevel;
+import forge.view.match.ViewHand;
 
 /**
  * Child controller - handles operations related to cards in user's hand and
@@ -51,8 +53,8 @@ public class ControlHand {
     private final List<Card> cardsInPanel;
     private final ViewHand view;
 
-    private MouseAdapter maCardClick;
-    private MouseMotionAdapter maCardMove;
+    private MouseListener maCardClick;
+    private MouseMotionListener maCardMove;
 
     /** The o1. */
     private Observer o1;
diff --git a/src/main/java/forge/control/match/ControlTabber.java b/src/main/java/forge/control/match/ControlTabber.java
index c76982ef423..a136bc80ef2 100644
--- a/src/main/java/forge/control/match/ControlTabber.java
+++ b/src/main/java/forge/control/match/ControlTabber.java
@@ -19,6 +19,7 @@ package forge.control.match;
 
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.util.Observable;
 import java.util.Observer;
 
@@ -36,7 +37,7 @@ import forge.view.match.ViewTabber;
  */
 public class ControlTabber extends MyObservable {
     private final ViewTabber view;
-    private MouseAdapter maMilling, maUnlimited,
+    private MouseListener maMilling, maUnlimited,
         maMana, maSetup, maTutor, maCounter, maTap, maUntap, maLife;
 
     private Observer stackObserver, logObserver;