diff --git a/panels/dock/tray/TrayItemSurfacePopup.qml b/panels/dock/tray/TrayItemSurfacePopup.qml
index c3cfbcdc2..c4bf38aa6 100644
--- a/panels/dock/tray/TrayItemSurfacePopup.qml
+++ b/panels/dock/tray/TrayItemSurfacePopup.qml
@@ -128,6 +128,13 @@ Item {
         }
     }
 
+    Connections {
+        target: toolTip.shellSurface
+        function onAboutToDestroy() {
+            toolTip.close()
+        }
+    }
+
     Connections {
         target: DockCompositor
         function onPopupCreated(popupSurface) {