diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 2f998c5e03ac..d6b2851ea856 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2123,11 +2123,6 @@ ColorWindow::ColorWindow(OUString  rCommand,
     mxPaletteManager->ReloadColorSet(maColorIconView);
     mxPaletteManager->ReloadRecentColorSet(maRecentColorIconView);
 
-    // ensure minimum height to also provide space for palettes with
-    // more colors when one with few colors is initially selected
-    if (maColorIconView.get_size_request().Height() < 250)
-        maColorIconView.set_size_request(-1, 250);
-
     AddStatusListener( u".uno:ColorTableState"_ustr );
     AddStatusListener( maCommand );
     if ( maCommand == ".uno:FrameLineColor" )
diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui
index 5c51bceccf7c..973897eefd21 100644
--- a/svx/uiconfig/ui/colorwindow.ui
+++ b/svx/uiconfig/ui/colorwindow.ui
@@ -123,20 +123,23 @@
         </child>
         <child>
           <object class="GtkScrolledWindow">
+            <property name="height-request">250</property>
             <property name="visible">True</property>
             <property name="can-focus">True</property>
-            <property name="vexpand">True</property>
+            <property name="valign">start</property>
             <property name="hscrollbar-policy">never</property>
             <property name="shadow-type">in</property>
+            <property name="min-content-height">250</property>
             <property name="overlay-scrolling">False</property>
+            <property name="max-content-height">250</property>
             <property name="propagate-natural-width">True</property>
             <property name="propagate-natural-height">True</property>
             <child>
               <object class="GtkIconView" id="coloriconview">
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
+                <property name="valign">start</property>
                 <property name="margin">6</property>
-                <property name="vexpand">True</property>
                 <property name="model">coloriconview_model</property>
                 <property name="columns">12</property>
                 <property name="pixbuf-column">0</property>