diff --git a/resources/qml/ExpandableComponent.qml b/resources/qml/ExpandableComponent.qml
index 262c6bfd3f..3b1105ddd6 100644
--- a/resources/qml/ExpandableComponent.qml
+++ b/resources/qml/ExpandableComponent.qml
@@ -24,6 +24,9 @@ Item
     // How much spacing is needed around the popupItem
     property alias popupPadding: popup.padding
 
+    // How much spacing is needed for the popupItem by Y coordinate
+    property var popupSpacingY: 0
+
     // How much padding is needed around the header & button
     property alias headerPadding: background.padding
 
@@ -143,7 +146,7 @@ Item
         id: popup
 
         // Ensure that the popup is located directly below the headerItem
-        y: headerItemLoader.height + 2 * background.padding
+        y: headerItemLoader.height + 2 * background.padding + popupSpacingY
 
         // Make the popup right aligned with the rest. The 3x padding is due to left, right and padding between
         // the button & text.
diff --git a/resources/qml/PrintSetupSelector.qml b/resources/qml/PrintSetupSelector.qml
index 8271484e6a..5f593f9ba2 100644
--- a/resources/qml/PrintSetupSelector.qml
+++ b/resources/qml/PrintSetupSelector.qml
@@ -29,6 +29,7 @@ Cura.ExpandableComponent
     iconSource: UM.Theme.getIcon("pencil")
 
     popupPadding : 0
+    popupSpacingY: 10
 
     onCurrentModeIndexChanged: UM.Preferences.setValue("cura/active_mode", currentModeIndex)
 
@@ -150,10 +151,13 @@ Cura.ExpandableComponent
                 verticalAlignment: Text.AlignVCenter
                 color: UM.Theme.getColor("text")
                 height: parent.height
-                anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
-//                anchors.bottomMargin: UM.Theme.getSize("sidebar_margin").height
-                anchors.left: parent.left
-                anchors.leftMargin: UM.Theme.getSize("print_setup_selector_margin").height
+
+                anchors
+                {
+                    topMargin: UM.Theme.getSize("sidebar_margin").height
+                    left: parent.left
+                    leftMargin: UM.Theme.getSize("print_setup_selector_margin").height
+                }
             }
 
             Rectangle