diff --git a/src/gui/calendar-management/gcal-edit-calendar-page.c b/src/gui/calendar-management/gcal-edit-calendar-page.c
index cc09a954..cb8532ea 100644
--- a/src/gui/calendar-management/gcal-edit-calendar-page.c
+++ b/src/gui/calendar-management/gcal-edit-calendar-page.c
@@ -148,6 +148,7 @@ setup_calendar (GcalEditCalendarPage *self,
   /* If it's a file, set the file path */
   if (is_file)
     {
+      g_autofree gchar *basename = NULL;
       g_autofree gchar *text = NULL;
       g_autofree gchar *uri = NULL;
       ESourceLocal *local;
@@ -155,10 +156,12 @@ setup_calendar (GcalEditCalendarPage *self,
 
       local = e_source_get_extension (source, E_SOURCE_EXTENSION_LOCAL_BACKEND);
       file = e_source_local_get_custom_file (local);
+      basename = g_file_get_basename (file);
       uri = g_file_get_uri (file);
 
-      text = g_strdup_printf ("<a href=\"%s\">%s</a>", uri, uri);
+      text = g_strdup_printf ("<a href=\"%s\">%s</a>", uri, basename);
       adw_action_row_set_subtitle (self->calendar_url_row, text);
+      gtk_widget_set_tooltip_text (GTK_WIDGET (self->calendar_url_row), basename);
     }
 
   /* If it's remote, build the uri */
@@ -175,6 +178,7 @@ setup_calendar (GcalEditCalendarPage *self,
 
       text = g_strdup_printf ("<a href=\"%s\">%s</a>", uri, uri);
       adw_action_row_set_subtitle (self->calendar_url_row, text);
+      gtk_widget_set_tooltip_text (GTK_WIDGET (self->calendar_url_row), uri);
     }
 
   if (is_goa)
diff --git a/src/gui/calendar-management/gcal-edit-calendar-page.ui b/src/gui/calendar-management/gcal-edit-calendar-page.ui
index fe4daae9..93dda3b8 100644
--- a/src/gui/calendar-management/gcal-edit-calendar-page.ui
+++ b/src/gui/calendar-management/gcal-edit-calendar-page.ui
@@ -43,6 +43,7 @@
             <child>
               <object class="AdwActionRow" id="calendar_url_row">
                 <property name="title" translatable="yes">Location</property>
+                <property name="subtitle-lines">1</property>
                 <property name="visible" bind-source="calendar_url_row" bind-property="visible" bind-flags="default" />
                 <style>
                   <class name="property"/>