diff --git a/MusicPlayer/MusicPlayer/PlaylistMaker.Designer.cs b/MusicPlayer/MusicPlayer/PlaylistMaker.Designer.cs
index dd9d26f..5fa3ff3 100644
--- a/MusicPlayer/MusicPlayer/PlaylistMaker.Designer.cs
+++ b/MusicPlayer/MusicPlayer/PlaylistMaker.Designer.cs
@@ -109,6 +109,7 @@ namespace MusicPlayer
             this.PlaylistNewInputfield.Name = "PlaylistNewInputfield";
             this.PlaylistNewInputfield.Size = new System.Drawing.Size(225, 20);
             this.PlaylistNewInputfield.TabIndex = 5;
+            this.PlaylistNewInputfield.KeyUp += new System.Windows.Forms.KeyEventHandler(this.PlaylistNewInputfield_KeyUp);
             // 
             // label1
             // 
diff --git a/MusicPlayer/MusicPlayer/PlaylistMaker.cs b/MusicPlayer/MusicPlayer/PlaylistMaker.cs
index 176562e..bd4a079 100644
--- a/MusicPlayer/MusicPlayer/PlaylistMaker.cs
+++ b/MusicPlayer/MusicPlayer/PlaylistMaker.cs
@@ -120,7 +120,11 @@ namespace MusicPlayer
 
         private void PlaylistNewButton_Click(object sender, EventArgs e)
         {
-            pl.MakeNewPlaylistByName(PlaylistNewInputfield.Text);
+            string name = PlaylistNewInputfield.Text;
+            PlaylistNewInputfield.Text = "";
+            name = name.Replace('/', '-');
+            name = name.Replace('\\', '-');
+            pl.MakeNewPlaylistByName(name);
             Repopulate(true);
         }
 
@@ -133,5 +137,13 @@ namespace MusicPlayer
         {
             SearchAllSongs(FilterTextBox.Text);
         }
+
+        private void PlaylistNewInputfield_KeyUp(object sender, KeyEventArgs e)
+        {
+            if(e.KeyCode == Keys.Enter)
+            {
+                PlaylistNewButton_Click(sender, new EventArgs());
+            }
+        }
     }
 }