diff --git a/src/gcal-window.c b/src/gcal-window.c
index a4aa620e..9ce99826 100644
--- a/src/gcal-window.c
+++ b/src/gcal-window.c
@@ -868,6 +868,8 @@ show_source_dialog (GtkButton *button,
 
   gcal_source_dialog_set_mode (GCAL_SOURCE_DIALOG (priv->source_dialog), GCAL_SOURCE_DIALOG_MODE_CREATE);
 
+  gtk_widget_hide (priv->calendar_popover);
+
   gtk_dialog_run (GTK_DIALOG (priv->source_dialog));
   gtk_widget_hide (priv->source_dialog);
 }
@@ -900,6 +902,8 @@ source_row_activated (GtkListBox    *listbox,
   gcal_source_dialog_set_mode (GCAL_SOURCE_DIALOG (priv->source_dialog), GCAL_SOURCE_DIALOG_MODE_EDIT);
   gcal_source_dialog_set_source (GCAL_SOURCE_DIALOG (priv->source_dialog), source);
 
+  gtk_widget_hide (priv->calendar_popover);
+
   gtk_dialog_run (GTK_DIALOG (priv->source_dialog));
   gtk_widget_hide (priv->source_dialog);