diff --git a/src/gui/folderstatusview.cpp b/src/gui/folderstatusview.cpp
index 3e06244acf00f..d527f246a9de3 100644
--- a/src/gui/folderstatusview.cpp
+++ b/src/gui/folderstatusview.cpp
@@ -33,4 +33,14 @@ QRect FolderStatusView::visualRect(const QModelIndex &index) const
     return rect;
 }
 
+void FolderStatusView::keyboardSearch(const QString &search)
+{
+    QTreeView::keyboardSearch(search);
+
+    const auto index = currentIndex();
+    if (index.isValid()) {
+        scrollTo(index, QAbstractItemView::EnsureVisible);
+    }
+}
+
 } // namespace OCC
diff --git a/src/gui/folderstatusview.h b/src/gui/folderstatusview.h
index 6c66853001cab..962736d785cd9 100644
--- a/src/gui/folderstatusview.h
+++ b/src/gui/folderstatusview.h
@@ -23,6 +23,7 @@ class FolderStatusView : public QTreeView
 
     [[nodiscard]] QModelIndex indexAt(const QPoint &point) const override;
     [[nodiscard]] QRect visualRect(const QModelIndex &index) const override;
+    void keyboardSearch(const QString &search) override;
 };
 
 } // namespace OCC