diff --git a/qml/FullscreenFrame.qml b/qml/FullscreenFrame.qml
index c1a3aba7..3d108527 100644
--- a/qml/FullscreenFrame.qml
+++ b/qml/FullscreenFrame.qml
@@ -496,7 +496,10 @@ Control {
                 model: delegateSearchResultModel
                 padding: 10
                 interactive: true
-                vScrollBar: ScrollBar { }
+                vScrollBar: ScrollBar {
+                    visible: parent.model.count > 4 * 8
+                    active: parent.model.count > 4 * 8
+                }
             }
         }
 
diff --git a/qml/windowed/GridViewContainer.qml b/qml/windowed/GridViewContainer.qml
index f8f014f8..abe78dfd 100644
--- a/qml/windowed/GridViewContainer.qml
+++ b/qml/windowed/GridViewContainer.qml
@@ -33,6 +33,7 @@ FocusScope {
     readonly property alias currentItem: gridView.currentItem
     readonly property alias gridViewWidth: gridView.width
     property alias highlight: gridView.highlight
+    property ScrollBar vScrollBar
 
     function positionViewAtBeginning() {
         gridView.positionViewAtBeginning()
@@ -57,6 +58,7 @@ FocusScope {
             id: gridView
             width: root.cellWidth * columns + paddingColumns * Math.max(0, columns - 1) + paddingColumns
             height: root.cellHeight * rows + paddingRows * Math.max(0, rows - 1) + paddingRows
+            ScrollBar.vertical: root.vScrollBar
 
             anchors.centerIn: parent
 
diff --git a/qml/windowed/SearchResultView.qml b/qml/windowed/SearchResultView.qml
index 23142054..fcd369b7 100644
--- a/qml/windowed/SearchResultView.qml
+++ b/qml/windowed/SearchResultView.qml
@@ -38,22 +38,13 @@ Control {
             font: LauncherController.adjustFontWeight(DTK.fontManager.t6, Font.Bold)
         }
 
-        GridViewContainer {
-            id: searchResultViewContainer
-
-            KeyNavigation.tab: nextKeyTabTarget
-            Layout.alignment: Qt.AlignRight
-            Layout.topMargin: 10
-            Layout.preferredHeight: searchResultViewContainer.height
-            Layout.preferredWidth: searchResultViewContainer.width
-            interactive: true
-
+        DelegateModel {
+            id: delegateSearchResultModel
             model: SearchFilterProxyModel
-
             delegate: IconItemDelegate {
+                iconSource: iconName
                 width: searchResultViewContainer.cellWidth
                 height: searchResultViewContainer.cellHeight
-                iconSource: iconName
                 onItemClicked: {
                     launchApp(desktopId)
                 }
@@ -61,8 +52,28 @@ Control {
                     showContextMenu(this, model, false, false, true)
                 }
             }
+        }
+
+        GridViewContainer {
+            id: searchResultViewContainer
+
+            KeyNavigation.tab: nextKeyTabTarget
+            Layout.alignment: Qt.AlignRight
+            Layout.topMargin: 10
+            Layout.rightMargin: 10
+            Layout.preferredHeight: searchResultViewContainer.height
+            Layout.preferredWidth: searchResultViewContainer.width - 10
+            interactive: true
+
+            model: delegateSearchResultModel
 
             activeFocusOnTab: gridViewFocus
+
+            vScrollBar: ScrollBar {
+                id: vScrollBar
+                visible: parent.model.count > 4 * 4
+                active: parent.model.count > 4 * 4
+            }
         }
 
         Item {