diff --git a/resources/qml/ExpandableComponent.qml b/resources/qml/ExpandableComponent.qml
index e5eab3bd93..3742c6d5e5 100644
--- a/resources/qml/ExpandableComponent.qml
+++ b/resources/qml/ExpandableComponent.qml
@@ -305,28 +305,6 @@ Item
             padding: UM.Theme.getSize("default_margin").width
 
             contentItem: Item {}
-
-            onContentItemChanged:
-            {
-                // Since we want the size of the content to be set by the size of the content,
-                // we need to do it like this.
-                content.width = contentItem.width + 2 * content.padding
-                content.height = contentItem.height + 2 * content.padding
-            }
-        }
-    }
-
-    // DO NOT MOVE UP IN THE CODE: This connection has to be here, after the definition of the content item.
-    // Apparently the order in which these are handled matters and so the height is correctly updated if this is here.
-    Connections
-    {
-        // Since it could be that the content is dynamically populated, we should also take these changes into account.
-        target: content.contentItem
-        function onWidthChanged() { content.width = content.contentItem.width + 2 * content.padding }
-        function onHeightChanged()
-        {
-            content.height = content.contentItem.height + 2 * content.padding
-            contentContainer.height = contentHeader.height + content.height
         }
     }
 }
diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
index 046efe8b5b..69261033eb 100644
--- a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
+++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
@@ -15,9 +15,8 @@ Item
     id: content
 
     property int absoluteMinimumHeight: 200 * screenScaleFactor
-
-    width: UM.Theme.getSize("print_setup_widget").width - 2 * UM.Theme.getSize("default_margin").width
-    height: contents.height + buttonRow.height
+    implicitWidth: UM.Theme.getSize("print_setup_widget").width - 2 * UM.Theme.getSize("default_margin").width
+    implicitHeight: contents.height + buttonRow.height
 
     enum Mode
     {