diff --git a/panels/dock/package/main.qml b/panels/dock/package/main.qml
index ec9c57664..8d627f690 100644
--- a/panels/dock/package/main.qml
+++ b/panels/dock/package/main.qml
@@ -235,8 +235,8 @@ Window {
 
     Item {
         id: dockContainer
-        width: dock.useColumnLayout ? Panel.dockSize : parent.width
-        height: dock.useColumnLayout ? parent.height : Panel.dockSize
+        width: dock.useColumnLayout ? dock.dockSize : parent.width
+        height: dock.useColumnLayout ? parent.height : dock.dockSize
         anchors {
             left: parent.left
             top: parent.top
diff --git a/panels/dock/tray/package/tray.qml b/panels/dock/tray/package/tray.qml
index 4795b57f9..d90f2f5cf 100644
--- a/panels/dock/tray/package/tray.qml
+++ b/panels/dock/tray/package/tray.qml
@@ -102,7 +102,7 @@ AppletItem {
         isHorizontal: !tray.useColumnLayout
         model: DDT.TraySortOrderModel
         collapsed: DDT.TraySortOrderModel.collapsed
-        trayHeight: isHorizontal ? tray.implicitHeight : tray.implicitWidth
+        trayHeight: Panel.rootObject.dockSize
         surfaceAcceptor: isTrayPluginPopup
         color: "transparent"
         Component.onCompleted: {