diff --git a/gtk/ui/gtkfontchooserwidget.ui b/gtk/ui/gtkfontchooserwidget.ui
index 310f533b2b..0c7de2cb72 100644
--- a/gtk/ui/gtkfontchooserwidget.ui
+++ b/gtk/ui/gtkfontchooserwidget.ui
@@ -60,41 +60,95 @@
           <object class="GtkStack" id="list_stack">
             <property name="visible">True</property>
             <child>
-              <object class="GtkScrolledWindow" id="list_scrolled_window">
-                <property name="width_request">400</property>
-                <property name="height_request">300</property>
+              <object class="GtkGrid">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <property name="hscrollbar_policy">never</property>
-                <property name="shadow_type">etched-in</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">6</property>
                 <child>
-                  <object class="GtkTreeView" id="family_face_list">
+                  <object class="GtkScrolledWindow" id="list_scrolled_window">
+                    <property name="width_request">400</property>
+                    <property name="height_request">300</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="model">filter_model</property>
-                    <property name="headers_visible">False</property>
-                    <property name="enable_search">False</property>
-                    <property name="fixed_height_mode">True</property>
-                    <signal name="cursor-changed" handler="cursor_changed_cb" swapped="no"/>
-                    <signal name="row-activated" handler="row_activated_cb" swapped="no"/>
-                    <signal name="style-updated" handler="gtk_font_chooser_widget_set_cell_size" object="GtkFontChooserWidget" after="yes" swapped="yes"/>
-                    <child internal-child="selection">
-                      <object class="GtkTreeSelection" id="treeview-selection1"/>
-                    </child>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="hscrollbar_policy">never</property>
+                    <property name="shadow_type">etched-in</property>
                     <child>
-                      <object class="GtkTreeViewColumn" id="family_face_column">
-                        <property name="sizing">fixed</property>
-                        <property name="title" translatable="yes">Font Family</property>
+                      <object class="GtkTreeView" id="family_face_list">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="model">filter_model</property>
+                        <property name="headers_visible">False</property>
+                        <property name="enable_search">False</property>
+                        <property name="fixed_height_mode">True</property>
+                        <signal name="cursor-changed" handler="cursor_changed_cb" swapped="no"/>
+                        <signal name="row-activated" handler="row_activated_cb" swapped="no"/>
+                        <signal name="style-updated" handler="gtk_font_chooser_widget_set_cell_size" object="GtkFontChooserWidget" after="yes" swapped="yes"/>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" id="treeview-selection1"/>
+                        </child>
                         <child>
-                          <object class="GtkCellRendererText" id="family_face_cell">
-                            <property name="ellipsize">end</property>
+                          <object class="GtkTreeViewColumn" id="family_face_column">
+                            <property name="sizing">fixed</property>
+                            <property name="title" translatable="yes">Font Family</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="family_face_cell">
+                                <property name="ellipsize">end</property>
+                              </object>
+                            </child>
                           </object>
                         </child>
                       </object>
                     </child>
                   </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="preview">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">•</property>
+                    <property name="text">Sample string goes here</property>
+                    <signal name="scroll-event" handler="resize_by_scroll_cb" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkScale" id="size_slider">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hexpand">True</property>
+                    <property name="adjustment">slider_adjustment</property>
+                    <property name="draw_value">False</property>
+                    <property name="round-digits">0</property>
+                    <signal name="scroll-event" handler="resize_by_scroll_cb" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="size_spin">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">•</property>
+                    <property name="adjustment">spin_adjustment</property>
+                    <signal name="output" handler="output_cb"/>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">3</property>
+                  </packing>
                 </child>
               </object>
               <packing>
@@ -149,48 +203,6 @@
             <property name="width">2</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkEntry" id="preview">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="invisible_char">•</property>
-            <property name="text">Sample string goes here</property>
-            <signal name="scroll-event" handler="resize_by_scroll_cb" swapped="no"/>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkScale" id="size_slider">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hexpand">True</property>
-            <property name="adjustment">slider_adjustment</property>
-            <property name="draw_value">False</property>
-            <property name="round-digits">0</property>
-            <signal name="scroll-event" handler="resize_by_scroll_cb" swapped="no"/>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkSpinButton" id="size_spin">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="invisible_char">•</property>
-            <property name="adjustment">spin_adjustment</property>
-            <signal name="output" handler="output_cb"/>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
-        </child>
       </object>
       <packing>
         <property name="expand">True</property>