diff --git a/src/gcal-source-dialog.c b/src/gcal-source-dialog.c
index 7b5824e9..744ab1cc 100644
--- a/src/gcal-source-dialog.c
+++ b/src/gcal-source-dialog.c
@@ -757,6 +757,8 @@ response_signal (GtkDialog *dialog,
       g_list_free_full (priv->remote_sources, g_object_unref);
       priv->remote_sources = NULL;
     }
+
+  gtk_widget_hide (GTK_WIDGET (dialog));
 }
 
 static gboolean
diff --git a/src/gcal-window.c b/src/gcal-window.c
index 4db92e56..97e60757 100644
--- a/src/gcal-window.c
+++ b/src/gcal-window.c
@@ -909,7 +909,6 @@ show_source_dialog (GtkButton *button,
   gtk_widget_hide (priv->calendar_popover);
 
   gtk_dialog_run (GTK_DIALOG (priv->source_dialog));
-  gtk_widget_hide (priv->source_dialog);
 }
 
 static void
@@ -932,8 +931,6 @@ source_row_activated (GtkListBox    *listbox,
   gtk_widget_hide (priv->calendar_popover);
 
   gtk_dialog_run (GTK_DIALOG (priv->source_dialog));
-
-  gtk_widget_hide (priv->source_dialog);
 }
 
 static void