diff --git a/shell/ChangeLog b/shell/ChangeLog
index 11ae22875f..deeb935b5b 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-19  Ettore Perazzoli  <ettore@ximian.com>
+
+	* e-shortcuts.c (load_shortcuts): Also use the display name for
+	the storage.
+
 2001-08-19  Ettore Perazzoli  <ettore@ximian.com>
 
 	* e-shortcuts.c (load_shortcuts): Use xmlMemStrdup() to override
diff --git a/shell/e-shortcuts.c b/shell/e-shortcuts.c
index 5572207e60..28b74d239c 100644
--- a/shell/e-shortcuts.c
+++ b/shell/e-shortcuts.c
@@ -345,15 +345,21 @@ load_shortcuts (EShortcuts *shortcuts,
 
 					storage = e_storage_set_get_storage (priv->storage_set,
 									     uri + E_SHELL_URI_PREFIX_LEN + 1);
-					if (type != NULL)
-						xmlFree (type);
+					if (storage != NULL) {
+						if (type != NULL)
+							xmlFree (type);
+						storage_type = e_storage_get_toplevel_node_type (storage);
 
-					storage_type = e_storage_get_toplevel_node_type (storage);
+						if (storage_type == NULL)
+							type = NULL;
+						else
+							type = xmlMemStrdup (storage_type);
 
-					if (storage_type == NULL)
-						type = NULL;
-					else
-						type = xmlMemStrdup (storage_type);
+						if (name != NULL)
+							xmlFree (name);
+
+						name = xmlMemStrdup (e_storage_get_display_name (storage));
+					}
 				}
 			}