diff --git a/Shared/PlaylistManager.cs b/Shared/PlaylistManager.cs
index 3822a8c..ac9dd85 100644
--- a/Shared/PlaylistManager.cs
+++ b/Shared/PlaylistManager.cs
@@ -809,18 +809,7 @@ public void StorePlaylist(IPlaylist playlist, IPlaylistHandler playlistHandler,
             if (string.IsNullOrEmpty(fileName))
             {
                 // Generate Name
-                fileName = string.Join("_", playlist.Title
-                    .Replace("/", "")
-                    .Replace("\\", "")
-                    .Replace(".", "")
-                    .Replace(":", "")
-                    .Replace("*", "")
-                    .Replace("?", "")
-                    .Replace("\"", "")
-                    .Replace("<", "")
-                    .Replace(">", "")
-                    .Replace("|", "")
-                    .Split());
+                fileName = string.Join("_", string.Join("", playlist.Title.Split(Path.GetInvalidFileNameChars(), StringSplitOptions.RemoveEmptyEntries)).Split());
                 if (string.IsNullOrEmpty(fileName))
                 {
                     fileName = "playlist";
diff --git a/Shared/Types/Playlist.cs b/Shared/Types/Playlist.cs
index 3b83943..bb4ec09 100644
--- a/Shared/Types/Playlist.cs
+++ b/Shared/Types/Playlist.cs
@@ -162,7 +162,7 @@ public IPlaylistSong this[int index]
         public int Count => Songs.Count;
 
         /// <inheritdoc/>
-        public virtual bool IsReadOnly => false;
+        public virtual bool IsReadOnly => ReadOnly;
 
         /// <summary>
         /// Creates a new <see cref="IPlaylistSong"/> of type <typeparamref name="T"/> from the given <paramref name="song"/>.