diff --git a/app/src/main/kotlin/com/simplemobiletools/musicplayer/activities/TracksActivity.kt b/app/src/main/kotlin/com/simplemobiletools/musicplayer/activities/TracksActivity.kt
index ecdbacb9..b26c2c30 100644
--- a/app/src/main/kotlin/com/simplemobiletools/musicplayer/activities/TracksActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/musicplayer/activities/TracksActivity.kt
@@ -64,7 +64,6 @@ class TracksActivity : SimpleActivity() {
         playlist = Gson().fromJson<Playlist>(intent.getStringExtra(PLAYLIST), playlistType)
         if (playlist != null) {
             tracksType = TYPE_PLAYLIST
-            invalidateOptionsMenu()
         }
 
         val albumType = object : TypeToken<Album>() {}.type
@@ -79,6 +78,7 @@ class TracksActivity : SimpleActivity() {
             tracks_placeholder_2.beGone()
         }
 
+        refreshMenuItems()
         val titleToUse = playlist?.title ?: album?.title ?: folder ?: ""
         tracks_toolbar.title = titleToUse.replace("<", "&lt;")
 
diff --git a/app/src/main/res/layout/activity_albums.xml b/app/src/main/res/layout/activity_albums.xml
index 73178477..f385b1d4 100644
--- a/app/src/main/res/layout/activity_albums.xml
+++ b/app/src/main/res/layout/activity_albums.xml
@@ -16,7 +16,6 @@
             android:layout_height="?attr/actionBarSize"
             android:background="@color/color_primary"
             app:layout_scrollFlags="scroll|enterAlways"
-            app:menu="@menu/menu_playlist"
             app:title="@string/artist"
             app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />