diff --git a/plasmoid/contents/ui/TaskDelegate.qml b/plasmoid/contents/ui/TaskDelegate.qml
index 3024c1712..159fd5f50 100644
--- a/plasmoid/contents/ui/TaskDelegate.qml
+++ b/plasmoid/contents/ui/TaskDelegate.qml
@@ -76,6 +76,7 @@ MouseArea{
     property bool inBlockingAnimation: false
     property bool inBouncingAnimation: false
     property bool inPopup: false
+    property bool inRemoveStage: false
 
     property bool isActive: (IsActive === true) ? true : false
     property bool isDemandingAttention: (IsDemandingAttention === true) ? true : false
@@ -1361,6 +1362,7 @@ MouseArea{
     ListView.onRemove: SequentialAnimation {
         id: taskRealRemovalAnimation
         PropertyAction { target: mainItemContainer; property: "ListView.delayRemove"; value: true }
+        PropertyAction { target: mainItemContainer; property: "inRemoveStage"; value: true }
 
         //Animation Add/Remove (1) - when is window with no launcher, animations enabled
         //Animation Add/Remove (4) - the user removes a launcher, animation enabled
diff --git a/plasmoid/contents/ui/TaskIconItem.qml b/plasmoid/contents/ui/TaskIconItem.qml
index c100b74d4..150090ddb 100644
--- a/plasmoid/contents/ui/TaskIconItem.qml
+++ b/plasmoid/contents/ui/TaskIconItem.qml
@@ -531,6 +531,11 @@ Item{
 
             mainItemContainer.setBlockingAnimation(false);
             mainItemContainer.animationEnded();
+
+            if (!mainItemContainer.inRemoveStage) {
+                mainItemContainer.inBouncingAnimation = false;
+                root.removeWaitingLauncher(mainItemContainer.launcherUrl);
+            }
         }
 
         function clearAnimationsSignals() {