diff --git a/frame/popupwindow.cpp b/frame/popupwindow.cpp
index b674a179b..1e5f1b4c8 100644
--- a/frame/popupwindow.cpp
+++ b/frame/popupwindow.cpp
@@ -17,7 +17,7 @@ void PopupWindow::mouseReleaseEvent(QMouseEvent *event)
     QQuickWindowQmlImpl::mouseReleaseEvent(event);
     auto rect = geometry();
     if (!m_dragging && !rect.contains(event->globalPosition().toPoint()) && type() == Qt::Popup) {
-        close();
+        QMetaObject::invokeMethod(this, &QWindow::close, Qt::QueuedConnection);
     }
     m_dragging = false;
     m_pressing = false;
diff --git a/panels/dock/tray/package/ActionLegacyTrayPluginDelegate.qml b/panels/dock/tray/package/ActionLegacyTrayPluginDelegate.qml
index eb733230a..6fc131a1c 100644
--- a/panels/dock/tray/package/ActionLegacyTrayPluginDelegate.qml
+++ b/panels/dock/tray/package/ActionLegacyTrayPluginDelegate.qml
@@ -40,8 +40,8 @@ AppletItemButton {
     contentItem: Item {
         id: pluginItem
         property var plugin: DockCompositor.findSurface(model.surfaceId)
-        implicitHeight: plugin.height
-        implicitWidth: plugin.width
+        implicitHeight: plugin?.height
+        implicitWidth: plugin?.width
 
         property var itemGlobalPoint: {
             var a = pluginItem
diff --git a/panels/dock/tray/quickpanel/PluginItem.qml b/panels/dock/tray/quickpanel/PluginItem.qml
index 1547239ba..3d8da6e81 100644
--- a/panels/dock/tray/quickpanel/PluginItem.qml
+++ b/panels/dock/tray/quickpanel/PluginItem.qml
@@ -27,7 +27,7 @@ Control {
         anchors.fill: parent
         dragItem: root
         dragTextData: `${root.pluginId}::${root.itemKey}`
-        fallbackIconSize: traySurface ? traySurface.size : Qt.size(16, 16)
+        fallbackIconSize: traySurface ? Qt.size(traySurface.width, traySurface.height) : Qt.size(16, 16)
         enabledDrag: canDrag
     }