diff --git a/src/gui/gcal-calendar-button.c b/src/gui/gcal-calendar-button.c
index 0cbd10f39663ece57c2ebd31c7bbfb9263637652..d623c105f46ab86019f4e2fc05a41d8629e86546 100644
--- a/src/gui/gcal-calendar-button.c
+++ b/src/gui/gcal-calendar-button.c
@@ -96,6 +96,7 @@ create_row_func (gpointer data,
   label = gtk_label_new (gcal_calendar_get_name (calendar));
   gtk_label_set_xalign (GTK_LABEL (label), 0.0);
   gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
+  gtk_widget_set_tooltip_text (label, gcal_calendar_get_name (calendar));
   gtk_widget_set_hexpand (label, TRUE);
 
   /* checkbox */
diff --git a/src/gui/gcal-calendar-button.ui b/src/gui/gcal-calendar-button.ui
index cdd085fc3b0d8dc81d41b71a635a9874bc710d58..f02379ca6cda95c192ff5c87c0874a0e68ea15d5 100644
--- a/src/gui/gcal-calendar-button.ui
+++ b/src/gui/gcal-calendar-button.ui
@@ -55,20 +55,27 @@
           <object class="GtkScrolledWindow">
             <property name="hscrollbar_policy">never</property>
             <property name="max_content_height">450</property>
+            <property name="max_content_width">800</property>
             <property name="propagate-natural-height">True</property>
+            <property name="propagate-natural-width">True</property>
             <child>
-              <object class="GtkListBox" id="calendar_listbox">
-                <property name="hexpand">True</property>
-                <property name="selection_mode">none</property>
-                <signal name="row-activated" handler="on_listbox_row_activated_cb" object="GcalCalendarButton" swapped="no"/>
-                <style>
-                  <class name="calendar-list"/>
-                </style>
+              <object class="AdwClamp">
+                <property name="maximum-size">800</property>
+                <property name="tightening-threshold">800</property>
+                <child>
+                  <object class="GtkListBox" id="calendar_listbox">
+                    <property name="hexpand">True</property>
+                    <property name="selection_mode">none</property>
+                    <signal name="row-activated" handler="on_listbox_row_activated_cb" object="GcalCalendarButton" swapped="no"/>
+                    <style>
+                      <class name="calendar-list"/>
+                    </style>
+                  </object>
+                </child>
               </object>
             </child>
           </object>
         </child>
-
       </object>
     </child>
   </object>