4 files changed, 16 insertions, 4 deletions
diff --git a/modules/addressbook/e-book-shell-sidebar.c b/modules/addressbook/e-book-shell-sidebar.c
index d8b25ee3f4..9c655e7504 100644
--- a/modules/addressbook/e-book-shell-sidebar.c
+++ b/modules/addressbook/e-book-shell-sidebar.c
@@ -63,7 +63,10 @@ book_shell_sidebar_map_uid_to_source (GValue *value,
 
 	registry = E_SOURCE_REGISTRY (user_data);
 	uid = g_variant_get_string (variant, NULL);
-	source = e_source_registry_ref_source (registry, uid);
+	if (uid != NULL && *uid != '\0')
+		source = e_source_registry_ref_source (registry, uid);
+	else
+		source = e_source_registry_ref_default_address_book (registry);
 	g_value_take_object (value, source);
 
 	return (source != NULL);
diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c
index 5a5fa5c5ac..cc4765ce15 100644
--- a/modules/calendar/e-cal-shell-sidebar.c
+++ b/modules/calendar/e-cal-shell-sidebar.c
@@ -132,7 +132,10 @@ cal_shell_sidebar_map_uid_to_source (GValue *value,
 
 	registry = E_SOURCE_REGISTRY (user_data);
 	uid = g_variant_get_string (variant, NULL);
-	source = e_source_registry_ref_source (registry, uid);
+	if (uid != NULL && *uid != '\0')
+		source = e_source_registry_ref_source (registry, uid);
+	else
+		source = e_source_registry_ref_default_calendar (registry);
 	g_value_take_object (value, source);
 
 	return (source != NULL);
diff --git a/modules/calendar/e-memo-shell-sidebar.c b/modules/calendar/e-memo-shell-sidebar.c
index 597838cbee..b8ec4e46d8 100644
--- a/modules/calendar/e-memo-shell-sidebar.c
+++ b/modules/calendar/e-memo-shell-sidebar.c
@@ -129,7 +129,10 @@ memo_shell_sidebar_map_uid_to_source (GValue *value,
 
 	registry = E_SOURCE_REGISTRY (user_data);
 	uid = g_variant_get_string (variant, NULL);
-	source = e_source_registry_ref_source (registry, uid);
+	if (uid != NULL && *uid != '\0')
+		source = e_source_registry_ref_source (registry, uid);
+	else
+		source = e_source_registry_ref_default_memo_list (registry);
 	g_value_take_object (value, source);
 
 	return (source != NULL);
diff --git a/modules/calendar/e-task-shell-sidebar.c b/modules/calendar/e-task-shell-sidebar.c
index d611b1969a..298bd8ce6c 100644
--- a/modules/calendar/e-task-shell-sidebar.c
+++ b/modules/calendar/e-task-shell-sidebar.c
@@ -129,7 +129,10 @@ task_shell_sidebar_map_uid_to_source (GValue *value,
 
 	registry = E_SOURCE_REGISTRY (user_data);
 	uid = g_variant_get_string (variant, NULL);
-	source = e_source_registry_ref_source (registry, uid);
+	if (uid != NULL && *uid != '\0')
+		source = e_source_registry_ref_source (registry, uid);
+	else
+		source = e_source_registry_ref_default_task_list (registry);
 	g_value_take_object (value, source);
 
 	return (source != NULL);