diff --git a/src/folder/foldertreewidget.cpp b/src/folder/foldertreewidget.cpp
index 9033490..549dbc8 100644
--- a/src/folder/foldertreewidget.cpp
+++ b/src/folder/foldertreewidget.cpp
@@ -121,7 +121,6 @@ FolderTreeWidget::FolderTreeWidget(QWidget *parent,
 
     if ((options & UseLineEditForFiltering)) {
         connect(d->filterFolderLineEdit, &QLineEdit::textChanged, this, &FolderTreeWidget::slotFilterFixedString);
-        connect(d->filterFolderLineEdit, &QLineEdit::returnPressed, this, &FolderTreeWidget::focusTreeView);
         d->label->hide();
     } else {
         d->filterFolderLineEdit->hide();
@@ -131,12 +130,6 @@ FolderTreeWidget::FolderTreeWidget(QWidget *parent,
 
 FolderTreeWidget::~FolderTreeWidget() = default;
 
-void FolderTreeWidget::focusTreeView()
-{
-    d->filterFolderLineEdit->clear();
-    d->folderTreeView->setFocus();
-}
-
 void FolderTreeWidget::slotFilterFixedString(const QString &text)
 {
     delete d->saver;
@@ -319,7 +312,7 @@ void FolderTreeWidget::applyFilter(const QString &filter)
     d->label->setText(filter.isEmpty() ? i18n("You can start typing to filter the list of folders.") : i18n("Filter: (%1)", filter));
 
     HierarchicalFolderMatcher matcher;
-    matcher.setFilter(filter, d->entityOrderProxy->filterCaseSensitivity());
+    matcher.setFilter(filter.trimmed(), d->entityOrderProxy->filterCaseSensitivity());
     d->entityOrderProxy->setFolderMatcher(matcher);
     d->folderTreeView->expandAll();
     const QAbstractItemModel *const model = d->folderTreeView->model();