diff --git a/src/gcal-source-dialog.c b/src/gcal-source-dialog.c
index 9574f7e0..097187aa 100644
--- a/src/gcal-source-dialog.c
+++ b/src/gcal-source-dialog.c
@@ -115,6 +115,10 @@ static void       calendar_listbox_row_activated        (GtkListBox          *bo
                                                          GtkListBoxRow       *row,
                                                          gpointer             user_data);
 
+static gint       calendar_listbox_sort_func             (GtkListBoxRow       *row1,
+                                                          GtkListBoxRow       *row2,
+                                                          gpointer             user_data);
+
 static void       calendar_visible_check_toggled        (GObject             *object,
                                                          GParamSpec          *pspec,
                                                          gpointer             user_data);
@@ -304,6 +308,19 @@ back_button_clicked (GtkButton *button,
     }
 }
 
+static gint
+calendar_listbox_sort_func (GtkListBoxRow *row1,
+                            GtkListBoxRow *row2,
+                            gpointer       user_data)
+{
+  ESource *source1, *source2;
+
+  source1 = g_object_get_data (G_OBJECT (row1), "source");
+  source2 = g_object_get_data (G_OBJECT (row2), "source");
+
+  return g_strcmp0 (e_source_get_display_name (source1), e_source_get_display_name (source2));
+}
+
 static void
 calendar_visible_check_toggled (GObject    *object,
                                 GParamSpec *pspec,
@@ -1521,6 +1538,9 @@ gcal_source_dialog_constructed (GObject *object)
 
   // Setup listbox header functions
   gtk_list_box_set_header_func (GTK_LIST_BOX (priv->calendars_listbox), display_header_func, NULL, NULL);
+  gtk_list_box_set_sort_func (GTK_LIST_BOX (priv->calendars_listbox), (GtkListBoxSortFunc) calendar_listbox_sort_func,
+                              object, NULL);
+
   gtk_list_box_set_header_func (GTK_LIST_BOX (priv->online_accounts_listbox), display_header_func, NULL, NULL);
 
   // Action group