diff --git a/panels/dock/AppletItemButton.qml b/panels/dock/AppletItemButton.qml
index 993345bb3..1b1a697bd 100644
--- a/panels/dock/AppletItemButton.qml
+++ b/panels/dock/AppletItemButton.qml
@@ -4,7 +4,7 @@
 
 import QtQuick
 import QtQuick.Controls
-
+import org.deepin.ds 1.0
 import org.deepin.ds.dock 1.0
 import org.deepin.dtk
 
@@ -12,6 +12,7 @@ IconButton {
     id: control
     property bool isActive
     property real radius: 4
+    property bool autoClosePopup: false
 
     padding: 4
     topPadding: undefined
@@ -25,6 +26,14 @@ IconButton {
     icon.width: 16
     icon.height: 16
 
+    Connections {
+        target: control
+        enabled: autoClosePopup
+        function onClicked() {
+            Panel.requestClosePopup()
+        }
+    }
+
     background: AppletItemBackground {
         radius: control.radius
         isActive: control.isActive
diff --git a/panels/dock/tray/package/ActionToggleCollapseDelegate.qml b/panels/dock/tray/package/ActionToggleCollapseDelegate.qml
index 2f930eaac..4c30e88a8 100644
--- a/panels/dock/tray/package/ActionToggleCollapseDelegate.qml
+++ b/panels/dock/tray/package/ActionToggleCollapseDelegate.qml
@@ -15,6 +15,7 @@ AppletItemButton {
     property bool collapsed: DDT.TraySortOrderModel.collapsed
     property bool inputEventsEnabled: true
     hoverEnabled: inputEventsEnabled
+    autoClosePopup: true
 
     z: 5