diff --git a/src/qml/ContentView.qml b/src/qml/ContentView.qml
--- a/src/qml/ContentView.qml
+++ b/src/qml/ContentView.qml
@@ -234,6 +234,7 @@
                                                                         mainTitle: innerMainTitle,
                                                                         secondaryTitle: innerSecondaryTitle,
                                                                         image: innerImage,
+                                                                        stackView: localArtists.stackView
                                                                     })
 
                                     }
@@ -450,12 +451,6 @@
             State {
                 name: 'allAlbums'
                 when: listViews.currentIndex === 1
-                StateChangeScript {
-                    script: {
-                        if (localAlbumsLoader.localAlbums)
-                            localAlbumsLoader.localAlbums.stackView.pop({item: null, immediate: true})
-                    }
-                }
                 PropertyChanges {
                     target: mainContentView
                     Layout.fillWidth: true
@@ -503,12 +498,6 @@
             State {
                 name: 'allArtists'
                 when: listViews.currentIndex === 2
-                StateChangeScript {
-                    script: {
-                        if (localArtistsLoader.localArtists)
-                            localArtistsLoader.localArtists.stackView.pop({item: null, immediate: true})
-                    }
-                }
                 PropertyChanges {
                     target: mainContentView
                     Layout.fillWidth: true
@@ -623,15 +612,15 @@
 
             onOpen: {
                 elisa.singleAlbumProxyModel.loadAlbumData(databaseId)
-                localArtists.stackView.push(albumView, {
-                                                mainTitle: innerMainTitle,
-                                                secondaryTitle: innerSecondaryTitle,
-                                                image: innerImage,
-                                                stackView: localArtists.stackView,
-                                            })
+                innerAlbumGridView.stackView.push(albumView, {
+                                                      mainTitle: innerMainTitle,
+                                                      secondaryTitle: innerSecondaryTitle,
+                                                      image: innerImage,
+                                                      stackView: innerAlbumGridView.stackView,
+                                                  })
             }
 
-            onGoBack: localArtists.stackView.pop()
+            onGoBack: innerAlbumGridView.stackView.pop()
 
             Binding {
                 target: innerAlbumGridView
diff --git a/src/qml/GridBrowserView.qml b/src/qml/GridBrowserView.qml
--- a/src/qml/GridBrowserView.qml
+++ b/src/qml/GridBrowserView.qml
@@ -37,6 +37,7 @@
     property alias showRating: navigationBar.showRating
     property bool delegateDisplaySecondaryText: true
     property alias expandedFilterView: navigationBar.expandedFilterView
+    property var stackView
 
     signal open(var innerMainTitle, var innerSecondaryTitle, var innerImage, var databaseId)
     signal goBack()