diff --git a/plugins/channelrx/filesink/filesinkgui.ui b/plugins/channelrx/filesink/filesinkgui.ui
index 55ba0b170..f8b7227c9 100644
--- a/plugins/channelrx/filesink/filesinkgui.ui
+++ b/plugins/channelrx/filesink/filesinkgui.ui
@@ -43,7 +43,7 @@
    <property name="minimumSize">
     <size>
      <width>550</width>
-     <height>100</height>
+     <height>0</height>
     </size>
    </property>
    <property name="windowTitle">
@@ -562,12 +562,23 @@
   </widget>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>ButtonSwitch</class>
+   <extends>QToolButton</extends>
+   <header>gui/buttonswitch.h</header>
+  </customwidget>
   <customwidget>
    <class>RollupContents</class>
    <extends>QWidget</extends>
    <header>gui/rollupcontents.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>ValueDialZ</class>
+   <extends>QWidget</extends>
+   <header>gui/valuedialz.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>GLSpectrum</class>
    <extends>QWidget</extends>
@@ -580,17 +591,6 @@
    <header>gui/glspectrumgui.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>ValueDialZ</class>
-   <extends>QWidget</extends>
-   <header>gui/valuedialz.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ButtonSwitch</class>
-   <extends>QToolButton</extends>
-   <header>gui/buttonswitch.h</header>
-  </customwidget>
  </customwidgets>
  <resources>
   <include location="../../../sdrgui/resources/res.qrc"/>
diff --git a/plugins/channelrx/noisefigure/noisefiguregui.ui b/plugins/channelrx/noisefigure/noisefiguregui.ui
index eee1aab46..b38e38f7e 100644
--- a/plugins/channelrx/noisefigure/noisefiguregui.ui
+++ b/plugins/channelrx/noisefigure/noisefiguregui.ui
@@ -710,6 +710,12 @@
     </property>
     <item>
      <widget class="QTableWidget" name="results">
+      <property name="minimumSize">
+       <size>
+        <width>0</width>
+        <height>0</height>
+       </size>
+      </property>
       <property name="toolTip">
        <string>Received packets</string>
       </property>
@@ -786,7 +792,7 @@
    <property name="minimumSize">
     <size>
      <width>200</width>
-     <height>200</height>
+     <height>0</height>
     </size>
    </property>
    <property name="windowTitle">
@@ -889,12 +895,22 @@
   </widget>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>ButtonSwitch</class>
+   <extends>QToolButton</extends>
+   <header>gui/buttonswitch.h</header>
+  </customwidget>
   <customwidget>
    <class>RollupContents</class>
    <extends>QWidget</extends>
    <header>gui/rollupcontents.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>QChartView</class>
+   <extends>QGraphicsView</extends>
+   <header>QtCharts</header>
+  </customwidget>
   <customwidget>
    <class>ValueDialZ</class>
    <extends>QWidget</extends>
@@ -907,16 +923,6 @@
    <header>gui/levelmeter.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>ButtonSwitch</class>
-   <extends>QToolButton</extends>
-   <header>gui/buttonswitch.h</header>
-  </customwidget>
-  <customwidget>
-   <class>QChartView</class>
-   <extends>QGraphicsView</extends>
-   <header>QtCharts</header>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>deltaFrequency</tabstop>
diff --git a/plugins/channelrx/radioastronomy/radioastronomygui.ui b/plugins/channelrx/radioastronomy/radioastronomygui.ui
index 9c15e2fd8..cf468b062 100644
--- a/plugins/channelrx/radioastronomy/radioastronomygui.ui
+++ b/plugins/channelrx/radioastronomy/radioastronomygui.ui
@@ -1743,7 +1743,7 @@ This should be 2.73K when pointing at the sky</string>
    <property name="minimumSize">
     <size>
      <width>200</width>
-     <height>320</height>
+     <height>0</height>
     </size>
    </property>
    <property name="windowTitle">
@@ -3419,7 +3419,7 @@ This should be close to the expected difference in power between hot and cold ca
    <property name="minimumSize">
     <size>
      <width>200</width>
-     <height>230</height>
+     <height>0</height>
     </size>
    </property>
    <property name="windowTitle">
@@ -5156,12 +5156,6 @@ This should be close to the expected difference in power between hot and cold ca
    <header>gui/rollupcontents.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>ValueDialZ</class>
-   <extends>QWidget</extends>
-   <header>gui/valuedialz.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>QChartView</class>
    <extends>QGraphicsView</extends>
@@ -5173,6 +5167,12 @@ This should be close to the expected difference in power between hot and cold ca
    <header>gui/wrappingdatetimeedit.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>ValueDialZ</class>
+   <extends>QWidget</extends>
+   <header>gui/valuedialz.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>powerMean</tabstop>
diff --git a/plugins/channelrx/sigmffilesink/sigmffilesinkgui.ui b/plugins/channelrx/sigmffilesink/sigmffilesinkgui.ui
index a12c65b03..3bd4c59db 100644
--- a/plugins/channelrx/sigmffilesink/sigmffilesinkgui.ui
+++ b/plugins/channelrx/sigmffilesink/sigmffilesinkgui.ui
@@ -19,7 +19,7 @@
   <property name="minimumSize">
    <size>
     <width>552</width>
-    <height>102</height>
+    <height>0</height>
    </size>
   </property>
   <property name="font">
@@ -43,7 +43,7 @@
    <property name="minimumSize">
     <size>
      <width>550</width>
-     <height>100</height>
+     <height>0</height>
     </size>
    </property>
    <property name="windowTitle">
diff --git a/plugins/channeltx/modais/aismodgui.ui b/plugins/channeltx/modais/aismodgui.ui
index cf270f5b8..c527265ea 100644
--- a/plugins/channeltx/modais/aismodgui.ui
+++ b/plugins/channeltx/modais/aismodgui.ui
@@ -1022,7 +1022,7 @@
    <property name="minimumSize">
     <size>
      <width>0</width>
-     <height>200</height>
+     <height>0</height>
     </size>
    </property>
    <property name="windowTitle">
@@ -1177,6 +1177,11 @@
   </widget>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>ButtonSwitch</class>
+   <extends>QToolButton</extends>
+   <header>gui/buttonswitch.h</header>
+  </customwidget>
   <customwidget>
    <class>RollupContents</class>
    <extends>QWidget</extends>
@@ -1184,15 +1189,9 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>GLSpectrum</class>
+   <class>ValueDialZ</class>
    <extends>QWidget</extends>
-   <header>gui/glspectrum.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>GLSpectrumGUI</class>
-   <extends>QWidget</extends>
-   <header>gui/glspectrumgui.h</header>
+   <header>gui/valuedialz.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
@@ -1208,15 +1207,16 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>ValueDialZ</class>
+   <class>GLSpectrum</class>
    <extends>QWidget</extends>
-   <header>gui/valuedialz.h</header>
+   <header>gui/glspectrum.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>ButtonSwitch</class>
-   <extends>QToolButton</extends>
-   <header>gui/buttonswitch.h</header>
+   <class>GLSpectrumGUI</class>
+   <extends>QWidget</extends>
+   <header>gui/glspectrumgui.h</header>
+   <container>1</container>
   </customwidget>
   <customwidget>
    <class>LevelMeterVU</class>
diff --git a/plugins/channeltx/modfreedv/freedvmodgui.ui b/plugins/channeltx/modfreedv/freedvmodgui.ui
index 0f3a15610..d83b24d98 100644
--- a/plugins/channeltx/modfreedv/freedvmodgui.ui
+++ b/plugins/channeltx/modfreedv/freedvmodgui.ui
@@ -19,7 +19,7 @@
   <property name="minimumSize">
    <size>
     <width>390</width>
-    <height>0</height>
+    <height>643</height>
    </size>
   </property>
   <property name="font">
@@ -729,12 +729,23 @@
   </widget>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>ButtonSwitch</class>
+   <extends>QToolButton</extends>
+   <header>gui/buttonswitch.h</header>
+  </customwidget>
   <customwidget>
    <class>RollupContents</class>
    <extends>QWidget</extends>
    <header>gui/rollupcontents.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>ValueDialZ</class>
+   <extends>QWidget</extends>
+   <header>gui/valuedialz.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>GLSpectrum</class>
    <extends>QWidget</extends>
@@ -747,17 +758,6 @@
    <header>gui/glspectrumgui.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>ValueDialZ</class>
-   <extends>QWidget</extends>
-   <header>gui/valuedialz.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ButtonSwitch</class>
-   <extends>QToolButton</extends>
-   <header>gui/buttonswitch.h</header>
-  </customwidget>
   <customwidget>
    <class>LevelMeterVU</class>
    <extends>QWidget</extends>
diff --git a/plugins/channeltx/modssb/ssbmodgui.ui b/plugins/channeltx/modssb/ssbmodgui.ui
index 69d90c843..5e11c3add 100644
--- a/plugins/channeltx/modssb/ssbmodgui.ui
+++ b/plugins/channeltx/modssb/ssbmodgui.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>414</width>
-    <height>331</height>
+    <height>627</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -19,7 +19,7 @@
   <property name="minimumSize">
    <size>
     <width>414</width>
-    <height>0</height>
+    <height>627</height>
    </size>
   </property>
   <property name="font">
@@ -1262,12 +1262,23 @@
   </widget>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>ButtonSwitch</class>
+   <extends>QToolButton</extends>
+   <header>gui/buttonswitch.h</header>
+  </customwidget>
   <customwidget>
    <class>RollupContents</class>
    <extends>QWidget</extends>
    <header>gui/rollupcontents.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>ValueDialZ</class>
+   <extends>QWidget</extends>
+   <header>gui/valuedialz.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>GLSpectrum</class>
    <extends>QWidget</extends>
@@ -1280,17 +1291,6 @@
    <header>gui/glspectrumgui.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>ValueDialZ</class>
-   <extends>QWidget</extends>
-   <header>gui/valuedialz.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ButtonSwitch</class>
-   <extends>QToolButton</extends>
-   <header>gui/buttonswitch.h</header>
-  </customwidget>
   <customwidget>
    <class>LevelMeterVU</class>
    <extends>QWidget</extends>
diff --git a/plugins/channeltx/udpsource/udpsourcegui.ui b/plugins/channeltx/udpsource/udpsourcegui.ui
index 90cccc5ef..2e537378e 100644
--- a/plugins/channeltx/udpsource/udpsourcegui.ui
+++ b/plugins/channeltx/udpsource/udpsourcegui.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>420</width>
-    <height>400</height>
+    <height>393</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -19,7 +19,7 @@
   <property name="minimumSize">
    <size>
     <width>420</width>
-    <height>0</height>
+    <height>393</height>
    </size>
   </property>
   <property name="font">
@@ -1079,12 +1079,23 @@
   </widget>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>ButtonSwitch</class>
+   <extends>QToolButton</extends>
+   <header>gui/buttonswitch.h</header>
+  </customwidget>
   <customwidget>
    <class>RollupContents</class>
    <extends>QWidget</extends>
    <header>gui/rollupcontents.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>ValueDialZ</class>
+   <extends>QWidget</extends>
+   <header>gui/valuedialz.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>GLSpectrum</class>
    <extends>QWidget</extends>
@@ -1097,17 +1108,6 @@
    <header>gui/glspectrumgui.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>ValueDialZ</class>
-   <extends>QWidget</extends>
-   <header>gui/valuedialz.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>ButtonSwitch</class>
-   <extends>QToolButton</extends>
-   <header>gui/buttonswitch.h</header>
-  </customwidget>
   <customwidget>
    <class>LevelMeterVU</class>
    <extends>QWidget</extends>
diff --git a/plugins/feature/satellitetracker/satellitetrackergui.ui b/plugins/feature/satellitetracker/satellitetrackergui.ui
index 53abf8df6..d85ae34ee 100644
--- a/plugins/feature/satellitetracker/satellitetrackergui.ui
+++ b/plugins/feature/satellitetracker/satellitetrackergui.ui
@@ -41,10 +41,16 @@
     <rect>
      <x>10</x>
      <y>10</y>
-     <width>301</width>
+     <width>320</width>
      <height>141</height>
     </rect>
    </property>
+   <property name="minimumSize">
+    <size>
+     <width>320</width>
+     <height>0</height>
+    </size>
+   </property>
    <property name="windowTitle">
     <string>Settings</string>
    </property>
@@ -407,7 +413,7 @@
    <property name="minimumSize">
     <size>
      <width>200</width>
-     <height>200</height>
+     <height>0</height>
     </size>
    </property>
    <property name="windowTitle">
diff --git a/plugins/feature/startracker/startrackergui.ui b/plugins/feature/startracker/startrackergui.ui
index 3f42355e6..0ec35de63 100644
--- a/plugins/feature/startracker/startrackergui.ui
+++ b/plugins/feature/startracker/startrackergui.ui
@@ -629,7 +629,7 @@ This can be specified as a decimal (E.g. 34.23) or in degrees, minutes and secon
    <property name="minimumSize">
     <size>
      <width>200</width>
-     <height>200</height>
+     <height>0</height>
     </size>
    </property>
    <property name="windowTitle">
diff --git a/plugins/feature/vorlocalizer/vorlocalizergui.ui b/plugins/feature/vorlocalizer/vorlocalizergui.ui
index 1653842f4..c40b6e57f 100644
--- a/plugins/feature/vorlocalizer/vorlocalizergui.ui
+++ b/plugins/feature/vorlocalizer/vorlocalizergui.ui
@@ -327,7 +327,7 @@ QToolTip{background-color: white; color: black;}</string>
    <property name="minimumSize">
     <size>
      <width>0</width>
-     <height>145</height>
+     <height>0</height>
     </size>
    </property>
    <property name="windowTitle">
diff --git a/sdrgui/device/deviceuiset.cpp b/sdrgui/device/deviceuiset.cpp
index aa1ff9a6e..59025ecc4 100644
--- a/sdrgui/device/deviceuiset.cpp
+++ b/sdrgui/device/deviceuiset.cpp
@@ -27,6 +27,7 @@
 #include "gui/glspectrumgui.h"
 // #include "gui/channelwindow.h"
 #include "gui/workspace.h"
+#include "gui/rollupcontents.h"
 #include "device/devicegui.h"
 #include "device/deviceset.h"
 #include "device/deviceapi.h"
@@ -337,6 +338,7 @@ void DeviceUISet::loadRxChannelSettings(const Preset *preset, PluginAPI *pluginA
                 }
 
                 rxChannelGUI->restoreGeometry(rxChannelGUI->getGeometryBytes());
+                rxChannelGUI->getRollupContents()->arrangeRollups();
                 rxChannelGUI->setDeviceType(ChannelGUI::DeviceRx);
                 rxChannelGUI->setDeviceSetIndex(m_deviceSetIndex);
                 rxChannelGUI->setIndex(channelAPI->getIndexInDeviceSet());
@@ -465,6 +467,7 @@ void DeviceUISet::loadTxChannelSettings(const Preset *preset, PluginAPI *pluginA
                 }
 
                 txChannelGUI->restoreGeometry(txChannelGUI->getGeometryBytes());
+                txChannelGUI->getRollupContents()->arrangeRollups();
                 txChannelGUI->setDeviceType(ChannelGUI::DeviceTx);
                 txChannelGUI->setDeviceSetIndex(m_deviceSetIndex);
                 txChannelGUI->setIndex(channelAPI->getIndexInDeviceSet());
@@ -638,6 +641,7 @@ void DeviceUISet::loadMIMOChannelSettings(const Preset *preset, PluginAPI *plugi
                 }
 
                 channelGUI->restoreGeometry(channelGUI->getGeometryBytes());
+                channelGUI->getRollupContents()->arrangeRollups();
                 channelGUI->setDeviceType(ChannelGUI::DeviceMIMO);
                 channelGUI->setDeviceSetIndex(m_deviceSetIndex);
                 channelGUI->setIndex(channelAPI->getIndexInDeviceSet());
diff --git a/sdrgui/feature/featureuiset.cpp b/sdrgui/feature/featureuiset.cpp
index 1947589c8..e9bb2fc00 100644
--- a/sdrgui/feature/featureuiset.cpp
+++ b/sdrgui/feature/featureuiset.cpp
@@ -199,12 +199,14 @@ void FeatureUISet::loadFeatureSetSettings(
             {
                 (*workspaces)[originalWorkspaceIndex]->addToMdiArea((QMdiSubWindow*) featureGUI);
                 featureGUI->restoreGeometry(featureGUI->getGeometryBytes());
+                featureGUI->getRollupContents()->arrangeRollups();
             }
             else if (currentWorkspace) // restore in current workspace
             {
                 featureGUI->setWorkspaceIndex(currentWorkspace->getIndex());
                 currentWorkspace->addToMdiArea((QMdiSubWindow*) featureGUI);
                 featureGUI->restoreGeometry(featureGUI->getGeometryBytes());
+                featureGUI->getRollupContents()->arrangeRollups();
             }
         }
     }