diff --git a/gui/ActionPanel.java b/gui/ActionPanel.java
index df76bb8da2b5c5fae0319f0f92f0a305af567fdf..94e2e5e1b4ce5f6a3aac9583b031a3535a0bcb15 100644
--- a/gui/ActionPanel.java
+++ b/gui/ActionPanel.java
@@ -3,10 +3,18 @@ package gui;
 import javax.swing.JPanel;
 import static java.awt.BorderLayout.CENTER;
 import static java.awt.BorderLayout.WEST;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 
 public class ActionPanel extends BorderPanel {
     protected ActionPanel(JPanel tasksetPanel, JPanel schedulePanel) {
         add(WEST, tasksetPanel);
         add(CENTER, schedulePanel);
+
+        addMouseListener(new MouseAdapter() {
+            public void mouseClicked(MouseEvent e) {
+                grabFocus();
+            }
+        });
     }
 }
diff --git a/gui/tasksetgui/TasksetDisplay.java b/gui/tasksetgui/TasksetDisplay.java
index 16875e6aaa1369dc10303f021f0b696ee7e3d05d..2dd86729b3261d422b80e298593e3364bf91b93a 100644
--- a/gui/tasksetgui/TasksetDisplay.java
+++ b/gui/tasksetgui/TasksetDisplay.java
@@ -1,7 +1,5 @@
 package gui.tasksetgui;
 
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 import javax.swing.BoxLayout;
 import javax.swing.JPanel;
 import java.awt.Dimension;
@@ -32,12 +30,6 @@ public class TasksetDisplay extends BoxPanel implements Observer, UpdateListener
         this.taskset = taskset;
         taskset.addObserver(this);
 
-        addMouseListener(new MouseAdapter() {
-            public void mouseClicked(MouseEvent e) {
-                grabFocus();
-            }
-        });
-
         add(header);
         setMaximumSize(new Dimension(300, 35));
         add(createVerticalStrut(offset));