diff --git a/src/gui/calendar-management/gcal-calendar-management-dialog.ui b/src/gui/calendar-management/gcal-calendar-management-dialog.ui
index 7ef29448..aaa0755e 100644
--- a/src/gui/calendar-management/gcal-calendar-management-dialog.ui
+++ b/src/gui/calendar-management/gcal-calendar-management-dialog.ui
@@ -12,10 +12,8 @@
       <object class="AdwLeaflet">
         <property name="can-unfold">False</property>
         <child>
-          <object class="GtkBox" id="vbox">
-            <property name="orientation">vertical</property>
-
-            <child>
+          <object class="AdwToolbarView" id="vbox">
+            <child type="top">
               <object class="GtkHeaderBar" id="headerbar">
                 <property name="show-title-buttons">True</property>
                 <property name="title-widget">
@@ -24,19 +22,17 @@
               </object>
             </child>
 
-            <child>
+            <property name="content">
               <object class="GtkOverlay" id="overlay">
                 <child>
                   <object class="GtkStack" id="stack">
                     <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
                     <property name="vhomogeneous">False</property>
                     <property name="transition_type">crossfade</property>
                   </object>
                 </child>
               </object>
-            </child>
-
+            </property>
           </object>
         </child>
       </object>