diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt
index 7792fd464..8a3324c8d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt
@@ -65,9 +65,8 @@ class CreatePlaylistDialog : DialogFragment() {
                 val playlistName = playlistView.text.toString()
                 if (!TextUtils.isEmpty(playlistName)) {
                     libraryViewModel.addToPlaylist(playlistName, songs)
-
                 } else {
-                    playlistContainer.error = "Playlist is can't be empty"
+                    playlistContainer.error = "Playlist name can't be empty"
                 }
             }
             .create()
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt
index 518bca7ac..e7b771054 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt
@@ -28,6 +28,7 @@ import code.name.monkey.retromusic.repository.RealRepository
 import code.name.monkey.retromusic.util.DensityUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import kotlinx.coroutines.Dispatchers.IO
+import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.File
@@ -357,11 +358,21 @@ class LibraryViewModel(
                         it.toSongEntity(playListId = playlist.playListId)
                     })
                 }
-                Toast.makeText(
-                    App.getContext(),
-                    "Adding songs to $playlistName",
-                    Toast.LENGTH_SHORT
-                ).show()
+                withContext(Main) {
+                    Toast.makeText(
+                        App.getContext(),
+                        "Playlist already exists",
+                        Toast.LENGTH_SHORT
+                    ).show()
+                    if (songs.isNotEmpty()) {
+                       Toast.makeText(
+                            App.getContext(),
+                            "Adding songs to $playlistName",
+                            Toast.LENGTH_SHORT
+                        ).show()
+                    }
+                }
+
             }
         }
     }