diff --git a/src/gui/calendar-management/gcal-new-calendar-page.c b/src/gui/calendar-management/gcal-new-calendar-page.c
index 18ac9002..3612195f 100644
--- a/src/gui/calendar-management/gcal-new-calendar-page.c
+++ b/src/gui/calendar-management/gcal-new-calendar-page.c
@@ -51,7 +51,7 @@ struct _GcalNewCalendarPage
   GtkWidget          *cancel_button;
   GtkWidget          *credentials_cancel_button;
   GtkWidget          *credentials_connect_button;
-  GtkWindow          *credentials_dialog;
+  AdwWindow          *credentials_dialog;
   GtkEntry           *credentials_password_entry;
   GtkEntry           *credentials_user_entry;
   GtkColorDialogButton *local_calendar_color_button;
diff --git a/src/gui/calendar-management/gcal-new-calendar-page.ui b/src/gui/calendar-management/gcal-new-calendar-page.ui
index 289045bc..fc7448d4 100644
--- a/src/gui/calendar-management/gcal-new-calendar-page.ui
+++ b/src/gui/calendar-management/gcal-new-calendar-page.ui
@@ -180,107 +180,110 @@
   </template>
 
   <!-- Credentials popover -->
-  <object class="GtkWindow" id="credentials_dialog">
+  <object class="AdwWindow" id="credentials_dialog">
     <property name="title" translatable="yes">Credentials</property>
     <property name="modal">True</property>
     <property name="hide-on-close">True</property>
     <property name="default-width">350</property>
     <property name="default-height">150</property>
 
-    <child type="titlebar">
-      <object class="GtkHeaderBar">
-        <property name="show-title-buttons">False</property>
+    <property name="content">
+      <object class="AdwToolbarView">
+        <child type="top">
+          <object class="GtkHeaderBar">
+            <property name="show-title-buttons">False</property>
+
+            <child type="start">
+              <object class="GtkButton" id="credentials_cancel_button">
+                <property name="hexpand">True</property>
+                <property name="label" translatable="yes">Cancel</property>
+                <signal name="clicked" handler="on_credential_button_clicked_cb" object="GcalNewCalendarPage" swapped="no" />
+              </object>
+            </child>
+
+            <child type="end">
+              <object class="GtkButton" id="credentials_connect_button">
+                <property name="hexpand">True</property>
+                <property name="label" translatable="yes">Connect</property>
+                <signal name="clicked" handler="on_credential_button_clicked_cb" object="GcalNewCalendarPage" swapped="no" />
+                <style>
+                  <class name="suggested-action" />
+                </style>
+              </object>
+            </child>
 
-        <child type="start">
-          <object class="GtkButton" id="credentials_cancel_button">
-            <property name="hexpand">True</property>
-            <property name="label" translatable="yes">Cancel</property>
-            <signal name="clicked" handler="on_credential_button_clicked_cb" object="GcalNewCalendarPage" swapped="no" />
           </object>
         </child>
-
-        <child type="end">
-          <object class="GtkButton" id="credentials_connect_button">
-            <property name="hexpand">True</property>
-            <property name="label" translatable="yes">Connect</property>
-            <signal name="clicked" handler="on_credential_button_clicked_cb" object="GcalNewCalendarPage" swapped="no" />
-            <style>
-              <class name="suggested-action" />
-            </style>
-          </object>
-        </child>
-
-      </object>
-    </child>
-
-    <child>
-      <object class="GtkBox">
-        <property name="orientation">vertical</property>
-        <property name="margin-top">12</property>
-        <property name="margin-bottom">12</property>
-        <property name="margin-start">12</property>
-        <property name="margin-end">12</property>
-        <child>
-          <object class="GtkGrid" id="credentials_grid">
-            <property name="hexpand">True</property>
+        <property name="content">
+          <object class="GtkBox">
+            <property name="orientation">vertical</property>
             <property name="margin-top">12</property>
             <property name="margin-bottom">12</property>
             <property name="margin-start">12</property>
             <property name="margin-end">12</property>
-            <property name="row_spacing">6</property>
-            <property name="column_spacing">12</property>
             <child>
-              <object class="GtkLabel" id="credentials_user_dim_label">
-                <property name="label" translatable="yes">User</property>
-                <property name="xalign">1</property>
-                <layout>
-                  <property name="column">0</property>
-                  <property name="row">0</property>
-                </layout>
-                <style>
-                  <class name="dim-label" />
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="credentials_password_dim_label">
-                <property name="label" translatable="yes">Password</property>
-                <property name="xalign">1</property>
-                <layout>
-                  <property name="column">0</property>
-                  <property name="row">1</property>
-                </layout>
-                <style>
-                  <class name="dim-label" />
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="GtkEntry" id="credentials_user_entry">
+              <object class="GtkGrid" id="credentials_grid">
                 <property name="hexpand">True</property>
-                <signal name="activate" handler="on_credential_entry_activate_cb" object="GcalNewCalendarPage" swapped="no" />
-                <layout>
-                  <property name="column">1</property>
-                  <property name="row">0</property>
-                </layout>
+                <property name="margin-top">12</property>
+                <property name="margin-bottom">12</property>
+                <property name="margin-start">12</property>
+                <property name="margin-end">12</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">12</property>
+                <child>
+                  <object class="GtkLabel" id="credentials_user_dim_label">
+                    <property name="label" translatable="yes">User</property>
+                    <property name="xalign">1</property>
+                    <layout>
+                      <property name="column">0</property>
+                      <property name="row">0</property>
+                    </layout>
+                    <style>
+                      <class name="dim-label" />
+                    </style>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="credentials_password_dim_label">
+                    <property name="label" translatable="yes">Password</property>
+                    <property name="xalign">1</property>
+                    <layout>
+                      <property name="column">0</property>
+                      <property name="row">1</property>
+                    </layout>
+                    <style>
+                      <class name="dim-label" />
+                    </style>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="credentials_user_entry">
+                    <property name="hexpand">True</property>
+                    <signal name="activate" handler="on_credential_entry_activate_cb" object="GcalNewCalendarPage" swapped="no" />
+                    <layout>
+                      <property name="column">1</property>
+                      <property name="row">0</property>
+                    </layout>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="credentials_password_entry">
+                    <property name="hexpand">True</property>
+                    <property name="visibility">False</property>
+                    <signal name="activate" handler="on_credential_entry_activate_cb" object="GcalNewCalendarPage" swapped="no" />
+                    <layout>
+                      <property name="column">1</property>
+                      <property name="row">1</property>
+                    </layout>
+                  </object>
+                </child>
               </object>
             </child>
-            <child>
-              <object class="GtkEntry" id="credentials_password_entry">
-                <property name="hexpand">True</property>
-                <property name="visibility">False</property>
-                <signal name="activate" handler="on_credential_entry_activate_cb" object="GcalNewCalendarPage" swapped="no" />
-                <layout>
-                  <property name="column">1</property>
-                  <property name="row">1</property>
-                </layout>
-              </object>
-            </child>
-          </object>
-        </child>
 
+          </object>
+        </property>
       </object>
-    </child>
+    </property>
   </object>
 
   <!-- Headerbar buttons -->