diff --git a/panels/dock/tray/package/ActionShowStashDelegate.qml b/panels/dock/tray/package/ActionShowStashDelegate.qml
index 539a24182..295ea1314 100644
--- a/panels/dock/tray/package/ActionShowStashDelegate.qml
+++ b/panels/dock/tray/package/ActionShowStashDelegate.qml
@@ -25,7 +25,7 @@ AppletItemButton {
 
     padding: itemPadding
 
-    D.ColorSelector.hovered: (isDropHover && DDT.TraySortOrderModel.actionsAlwaysVisible) || hoverHandler.hovered
+    D.ColorSelector.hovered: (isDropHover && DDT.TraySortOrderModel.actionsAlwaysVisible) || hoverHandler.hovered || stashedPopup.popupVisible
 
     property var itemGlobalPoint: {
         var a = root
@@ -94,8 +94,12 @@ AppletItemButton {
     }
 
     onClicked: {
-        stashedPopup.open()
-        toolTip.close()
+        if (stashedPopup.popupVisible) {
+            stashedPopup.close();
+        } else {
+            stashedPopup.open();
+        }
+        toolTip.close();
     }
 
     PanelToolTip {