diff --git a/plugins/PreviewStage/PreviewMenu.qml b/plugins/PreviewStage/PreviewMenu.qml
index ccc0a98c6e..5b0ae4e9c5 100644
--- a/plugins/PreviewStage/PreviewMenu.qml
+++ b/plugins/PreviewStage/PreviewMenu.qml
@@ -121,6 +121,7 @@ Item
                 width: UM.Theme.getSize("default_lining").width
                 color: UM.Theme.getColor("lining")
             }
+
             Cura.PrintSetupSelector
             {
                 width: UM.Theme.getSize("print_setup_widget").width
diff --git a/plugins/SimulationView/SimulationViewMenuComponent.qml b/plugins/SimulationView/SimulationViewMenuComponent.qml
index fe9f4471fd..92a4e1e317 100644
--- a/plugins/SimulationView/SimulationViewMenuComponent.qml
+++ b/plugins/SimulationView/SimulationViewMenuComponent.qml
@@ -74,7 +74,7 @@ Cura.ExpandableComponent
         property bool only_show_top_layers: UM.Preferences.getValue("view/only_show_top_layers")
         property int top_layer_count: UM.Preferences.getValue("view/top_layer_count")
 
-        width: UM.Theme.getSize("layerview_menu_size").width
+        width: base.width - 2 * UM.Theme.getSize("default_margin").width
         height: childrenRect.height
 
         spacing: UM.Theme.getSize("layerview_row_spacing").height
diff --git a/resources/qml/ExpandableComponent.qml b/resources/qml/ExpandableComponent.qml
index 06b4146a57..c525d163fe 100644
--- a/resources/qml/ExpandableComponent.qml
+++ b/resources/qml/ExpandableComponent.qml
@@ -111,7 +111,7 @@ Item
         // Make the popup right aligned with the rest. The 3x padding is due to left, right and padding between
         //the button & text.
         x: -width + collapseButton.width + headerItemLoader.width + 3 * background.padding
-
+        padding: UM.Theme.getSize("default_margin").width
         closePolicy: Popup.CloseOnPressOutsideParent
 
         background: Rectangle
diff --git a/resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml b/resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml
index 7c70229b5d..721416352d 100644
--- a/resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml
+++ b/resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml
@@ -92,7 +92,7 @@ Cura.ExpandableComponent
 
     popupItem: Item
     {
-        width: base.width
+        width: base.width - 2 * UM.Theme.getSize("default_margin").width
         height: 200
 
         TabBar