diff --git a/panels/dock/tray/package/ActionLegacyTrayPluginDelegate.qml b/panels/dock/tray/package/ActionLegacyTrayPluginDelegate.qml
index 33562d855..ddb79877e 100644
--- a/panels/dock/tray/package/ActionLegacyTrayPluginDelegate.qml
+++ b/panels/dock/tray/package/ActionLegacyTrayPluginDelegate.qml
@@ -31,6 +31,7 @@ AppletItemButton {
 
     visible: !Drag.active && itemVisible
     hoverEnabled: inputEventsEnabled
+    enabled: !DDT.TraySortOrderModel.isCollapsing
 
     function updatePluginMargins()
     {
diff --git a/panels/dock/tray/package/TrayItemDelegateChooser.qml b/panels/dock/tray/package/TrayItemDelegateChooser.qml
index f02549115..ce0212295 100644
--- a/panels/dock/tray/package/TrayItemDelegateChooser.qml
+++ b/panels/dock/tray/package/TrayItemDelegateChooser.qml
@@ -36,7 +36,7 @@ LQM.DelegateChooser {
             contentItem: ActionLegacyTrayPluginDelegate {
                 id: traySurfaceDelegate
                 objectName: "tray"
-                inputEventsEnabled: !disableInputEvents && (model.sectionType !== "collapsable" || !DDT.TraySortOrderModel.collapsed)
+                inputEventsEnabled: !disableInputEvents && (model.sectionType !== "collapsable" || !DDT.TraySortOrderModel.isCollapsing)
                 itemVisible: traySurfacePositioner.itemVisible
                 dragable: model.sectionType !== "fixed"
                 isActive: surfacePopup.isOpened