diff --git a/plasmoid/contents/ui/TaskDelegate.qml b/plasmoid/contents/ui/TaskDelegate.qml
index ca29bfe8a..4d51a0ec7 100644
--- a/plasmoid/contents/ui/TaskDelegate.qml
+++ b/plasmoid/contents/ui/TaskDelegate.qml
@@ -639,8 +639,9 @@ MouseArea{
         }
 
         if (hoveredTimerObj){
-            hoveredTimerObj.stop();
-            hoveredTimerObj.destroy();
+            hoveredTimerObj.restart();
+            /*hoveredTimerObj.stop();
+            hoveredTimerObj.destroy();*/
         }
     }
 
diff --git a/plasmoid/contents/ui/ToolTipDelegate2.qml b/plasmoid/contents/ui/ToolTipDelegate2.qml
index cb4b79acc..19bbc11ce 100644
--- a/plasmoid/contents/ui/ToolTipDelegate2.qml
+++ b/plasmoid/contents/ui/ToolTipDelegate2.qml
@@ -124,7 +124,7 @@ PlasmaExtras.ScrollArea {
             }
 
             function checkMouseInside(){
-                var isInside = containsMouse || childrenContainMouse() || parentTask.containsMouse;
+                var isInside = containsMouse || childrenContainMouse() || (parentTask && parentTask.containsMouse);
                 if (isInside){
                     root.disableRestoreZoom = true;
                     mainToolTip.containsMouse = true;
diff --git a/plasmoid/contents/ui/ToolTipWindowMouseArea.qml b/plasmoid/contents/ui/ToolTipWindowMouseArea.qml
index 4686bb31a..b0ba648a9 100644
--- a/plasmoid/contents/ui/ToolTipWindowMouseArea.qml
+++ b/plasmoid/contents/ui/ToolTipWindowMouseArea.qml
@@ -78,6 +78,7 @@ MouseArea {
         } else {
             root.createContextMenu(rootTask, modelIndex).show();
         }
+        icList.hoveredIndex = -1;
         windowsPreviewDlg.hide();
         //rootTask.hideToolTipTemporarily();
     }
diff --git a/plasmoid/contents/ui/main.qml b/plasmoid/contents/ui/main.qml
index 74b4c6a23..ca7b89654 100644
--- a/plasmoid/contents/ui/main.qml
+++ b/plasmoid/contents/ui/main.qml
@@ -222,10 +222,15 @@ Item {
             }
 
             windowsPreviewDlg.activeItem = null;
+
+            toolTipDelegate.containsMouse = false;
             toolTipDelegate.parentTask = null;
             toolTipDelegate.parentIndex = -1;
             toolTipDelegate.windows = [];
             toolTipDelegate.isGroup = false;
+
+            root.disableRestoreZoom = false;
+
             visible = false;
         }