diff --git a/data/ui/window.ui b/data/ui/window.ui
index a9cfa63a..6c36b03f 100644
--- a/data/ui/window.ui
+++ b/data/ui/window.ui
@@ -303,16 +303,16 @@
   <object class="GtkPopover" id="calendar_popover">
     <property name="border_width">6</property>
     <child>
-      <object class="GbScrolledWindow">
+      <object class="GtkBox" id="calendar_box">
         <property name="visible">True</property>
-        <property name="hscrollbar_policy">never</property>
-        <property name="min_content_height">80</property>
-        <property name="max_content_height">500</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">6</property>
         <child>
-          <object class="GtkBox" id="calendar_box">
+          <object class="GbScrolledWindow">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
+            <property name="hscrollbar_policy">never</property>
+            <property name="min_content_height">80</property>
+            <property name="max_content_height">500</property>
             <child>
               <object class="GtkListBox" id="calendar_listbox">
                 <property name="visible">True</property>
@@ -324,26 +324,26 @@
                 </style>
               </object>
             </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton" id="calendar_settings_button">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="relief">none</property>
+            <property name="receives_default">True</property>
+            <signal name="clicked" handler="show_source_dialog" object="GcalWindow" swapped="no"/>
             <child>
-              <object class="GtkButton" id="calendar_settings_button">
+              <object class="GtkLabel" id="calendar_settings_label">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="relief">none</property>
-                <property name="receives_default">True</property>
-                <signal name="clicked" handler="show_source_dialog" object="GcalWindow" swapped="no"/>
-                <child>
-                  <object class="GtkLabel" id="calendar_settings_label">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Calendar Settings</property>
-                    <property name="xalign">0</property>
-                  </object>
-                </child>
+                <property name="label" translatable="yes">Calendar Settings</property>
+                <property name="xalign">0</property>
               </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
             </child>
           </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
         </child>
       </object>
     </child>