diff --git a/gui/tasksetgui/TasksetDisplay.java b/gui/tasksetgui/TasksetDisplay.java
index 20663d7ecab3db580049d6c77476e4e276a5dbca..ef541857a38c3b24b76a09cb112c53ecff7af6b5 100644
--- a/gui/tasksetgui/TasksetDisplay.java
+++ b/gui/tasksetgui/TasksetDisplay.java
@@ -99,7 +99,6 @@ public class TasksetDisplay extends BoxPanel implements Observer, UpdateListener
         marked = Optional.of((TaskGrid) obj);
 
         for (TaskGrid tg : gridList) {
-            //if (marked.map(taskgrid -> taskgrid.equals(tg)).orElse(false)) marked = Optional.of(tg);
             tg.unmark();
         }
 
@@ -144,6 +143,10 @@ public class TasksetDisplay extends BoxPanel implements Observer, UpdateListener
             if (prio != -1) {
                 taskset.removeTask(prio);
                 marked = Optional.empty();
+                // Unmarks the rest of the grid
+                for (TaskGrid tg : gridList) {
+                    tg.unmark();
+                }
             }
         } catch (NoSuchElementException e) {}
     }