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 db9c958d3..303807d49 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
@@ -387,21 +387,36 @@ class LibraryViewModel(
                         it.toSongEntity(playListId = playlist.playListId)
                     })
                 }
-                withContext(Main) {
-                    Toast.makeText(
-                        App.getContext(),
-                        "Playlist already exists",
-                        Toast.LENGTH_SHORT
-                    ).show()
-                    if (songs.isNotEmpty()) {
+            }
+            withContext(Main) {
+                when {
+                    playlists.isEmpty() -> {
                         Toast.makeText(
                             App.getContext(),
-                            "Adding songs to $playlistName",
+                            App.getContext()
+                                .getString(R.string.playlist_created_sucessfully, playlistName),
+                            Toast.LENGTH_SHORT
+                        ).show()
+                    }
+                    checkPlaylistExists(playlistName).isNotEmpty() -> {
+                        Toast.makeText(
+                            App.getContext(),
+                            App.getContext().getString(R.string.playList_already_exits),
+                            Toast.LENGTH_SHORT
+                        ).show()
+                    }
+                    playlists.isNotEmpty() -> {
+                        Toast.makeText(
+                            App.getContext(),
+                            App.getContext().getString(
+                                R.string.added_song_count_to_playlist,
+                                songs.size,
+                                playlistName
+                            ),
                             Toast.LENGTH_SHORT
                         ).show()
                     }
                 }
-
             }
         }
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a3c75861d..54c6b2fc9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -546,6 +546,9 @@
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
     <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
     <string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
+    <string name="playlist_created_sucessfully">%s created successfully</string>
+    <string name="playList_already_exits">Playlist already exists</string>
+    <string name="added_song_count_to_playlist">Added %d song(s) to %s</string>
     <string name="history_cleared">History cleared</string>
     <string name="history_undo_button">Undo</string>
 </resources>