diff --git a/components/ItemGrid/ItemGrid.brs b/components/ItemGrid/ItemGrid.brs
index 06b496ee..66bc1bfd 100644
--- a/components/ItemGrid/ItemGrid.brs
+++ b/components/ItemGrid/ItemGrid.brs
@@ -101,7 +101,7 @@ sub loadInitialItems()
     else if m.top.parentItem.collectionType = "tvshows"
         m.loadItemsTask.itemType = "Series"
     else if m.top.parentItem.collectionType = "music"
-        m.loadItemsTask.itemType = "MusicArtist"
+        m.loadItemsTask.itemType = "MusicArtist,MusicAlbum"
         m.loadItemsTask.fallbackType = "MusicAlbum"
         m.loadItemsTask.recursive = false
     else if m.top.parentItem.collectionType = "livetv"
diff --git a/components/music/NowPlaying.brs b/components/music/NowPlaying.brs
index b3c873f2..8f499f24 100644
--- a/components/music/NowPlaying.brs
+++ b/components/music/NowPlaying.brs
@@ -49,7 +49,10 @@ function previousClicked() as boolean
 end function
 
 function nextClicked() as boolean
-    m.top.audio.control = "skipcontent"
+    if m.top.audio.contentIsPlaylist
+        m.top.audio.control = "skipcontent"
+    end if
+    
     return true
 end function
 
diff --git a/source/ShowScenes.brs b/source/ShowScenes.brs
index 49dc4c1e..53ac746f 100644
--- a/source/ShowScenes.brs
+++ b/source/ShowScenes.brs
@@ -332,6 +332,7 @@ function CreateMusicArtistDetailsGroup(musicartist)
         group.pageContent = ItemMetaData(musicartist.id)
         group.albumData = MusicSongList(musicartist.id)
         group.observeField("playSong", m.port)
+        group.observeField("playAllSelected", m.port)
     else
         ' User has albums under artists
         group = CreateObject("roSGNode", "MusicArtistDetails")