diff --git a/applets/quicksettings/package/contents/ui/main.qml b/applets/quicksettings/package/contents/ui/main.qml
index 85f20ec3..822858f5 100644
--- a/applets/quicksettings/package/contents/ui/main.qml
+++ b/applets/quicksettings/package/contents/ui/main.qml
@@ -33,6 +33,8 @@ Item {
 
     Plasmoid.preferredRepresentation: plasmoid.fullRepresentation
 
+    Layout.minimumHeight: flow.implicitHeight + units.largeSpacing*2
+
     ListModel {
         id: settingsModel
 
diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml
index 903a208c..bb9a8bfd 100644
--- a/containments/panel/contents/ui/main.qml
+++ b/containments/panel/contents/ui/main.qml
@@ -126,7 +126,7 @@ PlasmaCore.ColorScope {
                left: parent.left
                right: parent.right
             }
-            height: applet && applet.expanded ? Math.max(applet.fullRepresentationItem.Layout.minimumHeight, units.iconSizes.medium) : units.iconSizes.medium
+            height: applet && (applet.expanded || plasmoid.applets.count == 1) ? Math.max(applet.fullRepresentationItem.Layout.minimumHeight, units.iconSizes.medium) : units.iconSizes.medium
             Behavior on height {
                 NumberAnimation {
                     duration: units.shortDuration