diff --git a/panels/dock/tray/package/TrayContainer.qml b/panels/dock/tray/package/TrayContainer.qml
index a67cfd6b9..01a85b703 100644
--- a/panels/dock/tray/package/TrayContainer.qml
+++ b/panels/dock/tray/package/TrayContainer.qml
@@ -143,8 +143,9 @@ Item {
         keys: ["text/x-dde-shell-tray-dnd-surfaceId"]
         onEntered: function (dragEvent) {
             let surfaceId = dragEvent.getDataAsString("text/x-dde-shell-tray-dnd-surfaceId")
-            console.log(surfaceId)
-            if (DDT.TraySortOrderModel.isDisplayedSurface(surfaceId)) {
+            let source = dragEvent.getDataAsString("text/x-dde-shell-tray-dnd-source")
+            console.log(surfaceId, source)
+            if (source !== "" && DDT.TraySortOrderModel.isDisplayedSurface(surfaceId)) {
                 dragEvent.accepted = false
             } else {
                 dragEvent.accepted = true
diff --git a/panels/dock/tray/quickpanel/DragItem.qml b/panels/dock/tray/quickpanel/DragItem.qml
index 54d0a6fa0..18279b8a8 100644
--- a/panels/dock/tray/quickpanel/DragItem.qml
+++ b/panels/dock/tray/quickpanel/DragItem.qml
@@ -22,7 +22,8 @@ Item {
     Component.onCompleted: {
         dragItem.Drag.mimeData = Qt.binding(function () {
             return {
-                "text/x-dde-shell-tray-dnd-surfaceId": root.dragTextData
+                "text/x-dde-shell-tray-dnd-surfaceId": root.dragTextData,
+                "text/x-dde-shell-tray-dnd-source": "quickPanel"
             }
         })
         dragItem.Drag.dragType = Drag.Automatic