diff --git a/resources/qml/ExpandableComponent.qml b/resources/qml/ExpandableComponent.qml
index 4170a0942e..04793653fe 100644
--- a/resources/qml/ExpandableComponent.qml
+++ b/resources/qml/ExpandableComponent.qml
@@ -162,7 +162,7 @@ Item
 
         background: Cura.RoundedRectangle
         {
-            cornerSide: Cura.RoundedRectangle.Direction.Down
+            cornerSide: Cura.RoundedRectangle.Direction.All
             color: contentBackgroundColor
             border.width: UM.Theme.getSize("default_lining").width
             border.color: UM.Theme.getColor("lining")
diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
index 7cd03ff74a..313bf0830c 100644
--- a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
+++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
@@ -38,11 +38,13 @@ Item
 
 
     // Header of the popup
-    Rectangle
+    Cura.RoundedRectangle
     {
         id: header
         height: UM.Theme.getSize("print_setup_widget_header").height
         color: UM.Theme.getColor("secondary")
+        cornerSide: Cura.RoundedRectangle.Direction.Up
+        radius: UM.Theme.getSize("default_radius").width
 
         anchors
         {