diff --git a/panels/dock/taskmanager/package/TaskManager.qml b/panels/dock/taskmanager/package/TaskManager.qml
index ff2769355..303a580d8 100644
--- a/panels/dock/taskmanager/package/TaskManager.qml
+++ b/panels/dock/taskmanager/package/TaskManager.qml
@@ -31,6 +31,7 @@ AppletItem {
         model: DelegateModel {
             id: visualModel
             model: taskmanager.Applet.dataModel
+            property int tmpIndex: 0
             delegate: DropArea {
                 id: delegateRoot
                 required property bool active
@@ -44,6 +45,7 @@ AppletItem {
                 implicitHeight: dockSize
 
                 onEntered: function(drag) {
+                    visualModel.tmpIndex = app.visualIndex
                     visualModel.items.move((drag.source as AppItem).visualIndex, app.visualIndex)
                 }
 
@@ -51,6 +53,12 @@ AppletItem {
                     drop.accept()
                     taskmanager.Applet.dataModel.moveTo(drop.source.itemId, visualIndex)
                 }
+                onExited : {
+                    if (delegateRoot.containsDrag) {
+                        var drop = delegateRoot.drag
+                        taskmanager.Applet.dataModel.moveTo(drag.source.itemId, visualModel.tmpIndex)
+                    }
+                }
 
                 property int visualIndex: DelegateModel.itemsIndex