diff --git a/widgets/FoldersView.qml b/widgets/FoldersView.qml
index 7392f0b..4fb11a4 100644
--- a/widgets/FoldersView.qml
+++ b/widgets/FoldersView.qml
@@ -1,82 +1,82 @@
 import QtQuick 2.0
 import QtQuick.Controls 2.10
 import org.kde.mauikit 1.0 as Maui
 import org.kde.kirigami 2.7 as Kirigami
 
 import "../view_models/BabeTable"
 import "../db/Queries.js" as Q
 import org.maui.vvave 1.0 as Vvave
 
-Kirigami.PageRow
+StackView
 {
     id: control
     clip: true
-    defaultColumnWidth: Kirigami.Units.gridUnit * 44
 
     property alias list : _filterList
     property alias listModel : _filterList.model
     property var tracks : []
     property string currentFolder : ""
+    property Flickable flickable: currentItem.flickable
 
-    initialPage: Maui.GridBrowser
+    initialItem: Maui.GridBrowser
     {
         id: browser
         checkable: false
         model: ListModel {}
         cellHeight: itemSize * 1.2
         onItemClicked:
         {
             var item = browser.model.get(index)
             _filterList.listModel.filter = ""
             currentFolder = item.path
             filter()
             control.push(_filterList)
         }
 
         Maui.Holder
         {
             anchors.fill: parent
             visible: !browser.count
             emoji: "qrc:/assets/dialog-information.svg"
             isMask: true
             title : qsTr("No Folders!")
             body: qsTr("Add new music to your sources to browse by folders")
             emojiSize: Maui.Style.iconSizes.huge
         }
     }
 
     BabeTable
     {
         id: _filterList
         coverArtVisible: true
         holder.emoji: "qrc:/assets/dialog-information.svg"
         holder.isMask: true
         holder.title : qsTr("No Tracks!")
         holder.body: qsTr("This source folder seems to be empty!")
         holder.emojiSize: Maui.Style.iconSizes.huge
         headBar.visible: true
         headBar.farLeftContent: ToolButton
         {
             icon.name: "go-previous"
-            onClicked: control.removePage(_filterList)
+            onClicked: control.pop()
         }
     }
 
     Component.onCompleted: populate()
 
     function populate()
     {
         browser.model.clear()
         var folders = Vvave.Vvave.sourceFolders();
         if(folders.length > 0)
             for(var i in folders)
                 browser.model.append(folders[i])
     }
 
     function filter()
     {
         var where = "source = \""+currentFolder+"\""
         _filterList.list.query = (Q.GET.tracksWhere_.arg(where))
 
     }
 }