diff --git a/libtaskmanager/groupmanager.cpp b/libtaskmanager/groupmanager.cpp
--- a/libtaskmanager/groupmanager.cpp
+++ b/libtaskmanager/groupmanager.cpp
@@ -645,6 +645,10 @@
             show = true;
         } else if (task->info().windowType(NET::UtilityMask) == NET::Utility) {
             removeTask(task);
+        } else if (abstractGroupingStrategy) {
+            // Group tasks again when they no longer demands attention.
+            removeTask(task);
+            addTask(task);
         }
     }
 
diff --git a/libtaskmanager/task.cpp b/libtaskmanager/task.cpp
--- a/libtaskmanager/task.cpp
+++ b/libtaskmanager/task.cpp
@@ -50,6 +50,9 @@
     // try to load icon via net_wm
     refreshIcon();
     refreshActivities();
+
+    // initial demands attention
+    d->demandedAttention = demandsAttention();
 }
 
 Task::~Task()