Index: shell/rb-playlist-manager.c
===================================================================
--- shell/rb-playlist-manager.c	(revision 5921)
+++ shell/rb-playlist-manager.c	(working copy)
@@ -677,8 +677,23 @@
 				rb_debug ("setting playlist name from file name");
 				path = g_filename_from_uri (uri, NULL, NULL);
 				if (path) {
+					gchar **filename_array = NULL;
+
 					name = g_path_get_basename (path);
+
+					if (g_str_has_suffix (name, ".pls")) {
+						filename_array = g_strsplit(name, ".pls", 0);
+						g_free(name);
+						name = g_strdup(filename_array[0]);
+					}
+					else if (g_str_has_suffix (name, ".m3u")) {
+						filename_array = g_strsplit(name, ".m3u", 0);
+						g_free(name);
+						name = g_strdup(filename_array[0]);
+					}
+
 					g_object_set (mgr->priv->loading_playlist, "name", name, NULL);
+					g_strfreev(filename_array);
 					g_free (path);
 				}
 			}
