diff --git a/qml/Desktop/main.qml b/qml/Desktop/main.qml
index 9a32bff..b474bb3 100644
--- a/qml/Desktop/main.qml
+++ b/qml/Desktop/main.qml
@@ -87,6 +87,8 @@ Item {
         focus: true
         model: dirModel
 
+        ScrollBar.vertical.policy: ScrollBar.AlwaysOff
+
         onIconSizeChanged: {
             globalSettings.desktopIconSize = _folderView.iconSize
         }
diff --git a/qml/FolderPage.qml b/qml/FolderPage.qml
index f631ca3..3c8a79c 100644
--- a/qml/FolderPage.qml
+++ b/qml/FolderPage.qml
@@ -130,6 +130,7 @@ Item {
                     text: qsTr("Empty Trash")
                     onClicked: dirModel.emptyTrash()
                     visible: dirModel.url === "trash:/"
+                    focusPolicy: Qt.NoFocus
                 }
             }
         }