diff --git a/mobile/app/package/contents/ui/Documents.qml b/mobile/app/package/contents/ui/Documents.qml
index f0e4279b2..3f5b402c1 100644
--- a/mobile/app/package/contents/ui/Documents.qml
+++ b/mobile/app/package/contents/ui/Documents.qml
@@ -80,7 +80,7 @@ Item {
                 onClicked: {
                     documentItem.path = model.filePath;
                     globalDrawer.opened = false;
-                    mainTabBar.currentTab = thumbnailsButton;
+                    applicationWindow().controlsVisible = false;
                 }
             }
         }
diff --git a/mobile/app/package/contents/ui/OkularDrawer.qml b/mobile/app/package/contents/ui/OkularDrawer.qml
index bb2a206a9..770353d3a 100644
--- a/mobile/app/package/contents/ui/OkularDrawer.qml
+++ b/mobile/app/package/contents/ui/OkularDrawer.qml
@@ -28,7 +28,7 @@ Kirigami.OverlayDrawer {
     edge: Qt.RightEdge
     contentItem: Item {
         id: browserFrame
-        implicitWidth: Kirigami.Units.gridUnit * 25
+        implicitWidth: Kirigami.Units.gridUnit * 45
         implicitHeight: implicitWidth
         state: "Hidden"
 
@@ -44,13 +44,8 @@ Kirigami.OverlayDrawer {
         }
 
         Connections {
-            id: scrollConnection
-            property int oldContentY:0
-            target: pageStack.currentItem
-
-            onContentYChanged: {
-                scrollConnection.oldContentY = pageStack.currentItem.contentY
-            }
+            target: documentItem
+            onPathChanged: mainTabBar.currentTab = thumbnailsButton;
         }
 
         ToolBar {
diff --git a/mobile/app/package/contents/ui/Thumbnails.qml b/mobile/app/package/contents/ui/Thumbnails.qml
index ab443ef0b..6e6936cb5 100644
--- a/mobile/app/package/contents/ui/Thumbnails.qml
+++ b/mobile/app/package/contents/ui/Thumbnails.qml
@@ -25,7 +25,6 @@ ThumbnailsBase {
     id: root
     model: documentItem.matchingPages
 
-    anchors.fill: parent
     ToolBar {
         id: toolBarContent
         width: root.width
@@ -38,7 +37,6 @@ ThumbnailsBase {
                 if (text.length > 2) {
                     documentItem.searchText(text);
                 } else {
-                    view.currentIndex = pageArea.delegate.pageNumber;
                     documentItem.resetSearch();
                 }
             }
diff --git a/mobile/app/package/contents/ui/ThumbnailsBase.qml b/mobile/app/package/contents/ui/ThumbnailsBase.qml
index c276e3f63..28608f4e3 100644
--- a/mobile/app/package/contents/ui/ThumbnailsBase.qml
+++ b/mobile/app/package/contents/ui/ThumbnailsBase.qml
@@ -34,8 +34,6 @@ Kirigami.Page {
     signal pageClicked(int pageNumber)
     property Item view: resultsGrid
 
-    anchors.fill: parent
-
     ScrollView {
         anchors {
             fill: parent