diff --git a/applets/showdesktop/MinimizeAllController.qml b/applets/showdesktop/MinimizeAllController.qml
index 1df55bb735..1e35f0c72c 100644
--- a/applets/showdesktop/MinimizeAllController.qml
+++ b/applets/showdesktop/MinimizeAllController.qml
@@ -67,8 +67,11 @@ Controller {
      */
     property var minimizedClients: ({})
 
+    property var activeClients: ({})
+
     function activate() {
         const clients = [];
+        activeClients[activityDesktopId] = tasksModel.activeTask.valid ? tasksModel.makePersistentModelIndex(tasksModel.activeTask.row) : null;
         for (let i = tasksModel.count - 1; i >= 0; i--) {
             const idx = tasksModel.makeModelIndex(i);
             const activities = tasksModel.data(idx, TaskManager.AbstractTasksModel.Activities);
@@ -104,6 +107,10 @@ Controller {
             tasksModel.requestToggleMinimized(idx);
         }
         minimizedClients[activityDesktopId] = [];
+        const activeIdx = activeClients[activityDesktopId];
+        if (activeIdx && activeIdx.valid) {
+            tasksModel.requestActivate(activeIdx);
+        }
     }
 
     // override