diff --git a/app/build.gradle b/app/build.gradle
index 5e1f7522a..3af34173c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -93,7 +93,7 @@ dependencies {
     implementation "androidx.appcompat:appcompat:$appcompat_version"
     implementation 'androidx.annotation:annotation:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-    implementation 'androidx.recyclerview:recyclerview:1.3.0-alpha01'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation "androidx.preference:preference-ktx:$preference_version"
     implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.palette:palette-ktx:1.0.0'
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 303807d49..42ebb8ab2 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
@@ -35,7 +35,7 @@ import kotlinx.coroutines.withContext
 import java.io.File
 
 class LibraryViewModel(
-    private val repository: RealRepository
+    private val repository: RealRepository,
 ) : ViewModel(), IMusicServiceEventListener {
 
     private val _paletteColor = MutableLiveData<Int>()
@@ -380,6 +380,14 @@ class LibraryViewModel(
                     createPlaylist(PlaylistEntity(playlistName = playlistName))
                 insertSongs(songs.map { it.toSongEntity(playlistId) })
                 forceReload(Playlists)
+                withContext(Main) {
+                    Toast.makeText(
+                        App.getContext(),
+                        App.getContext()
+                            .getString(R.string.playlist_created_sucessfully, playlistName),
+                        Toast.LENGTH_SHORT
+                    ).show()
+                }
             } else {
                 val playlist = playlists.firstOrNull()
                 if (playlist != null) {
@@ -389,34 +397,11 @@ class LibraryViewModel(
                 }
             }
             withContext(Main) {
-                when {
-                    playlists.isEmpty() -> {
-                        Toast.makeText(
-                            App.getContext(),
-                            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()
-                    }
-                }
+                Toast.makeText(App.getContext(), App.getContext().getString(
+                    R.string.added_song_count_to_playlist,
+                    songs.size,
+                    playlistName
+                ), Toast.LENGTH_SHORT).show()
             }
         }
     }