diff --git a/src/playlist/playlistcontainer.cpp b/src/playlist/playlistcontainer.cpp
index f653d4c43..443b5b224 100644
--- a/src/playlist/playlistcontainer.cpp
+++ b/src/playlist/playlistcontainer.cpp
@@ -264,6 +264,8 @@ void PlaylistContainer::ReloadSettings() {
   bool show_toolbar = settings_.value("show_toolbar", true).toBool();
   ui_->toolbar->setVisible(show_toolbar);
 
+  if (!show_toolbar) ui_->filter->clear();
+
 }
 
 bool PlaylistContainer::SearchFieldHasFocus() const {
@@ -271,9 +273,7 @@ bool PlaylistContainer::SearchFieldHasFocus() const {
 }
 
 void PlaylistContainer::FocusSearchField() {
-  if (ui_->toolbar->isVisible()) {
-    ui_->filter->setFocus();
-  }
+  if (ui_->toolbar->isVisible()) ui_->filter->setFocus();
 }
 
 void PlaylistContainer::ActivePlaying() {
@@ -455,19 +455,18 @@ void PlaylistContainer::resizeEvent(QResizeEvent *e) {
 
 void PlaylistContainer::FocusOnFilter(QKeyEvent *event) {
 
-  ui_->filter->setFocus();
-
-  switch (event->key()) {
-    case Qt::Key_Backspace:
-      break;
-
-    case Qt::Key_Escape:
-      ui_->filter->clear();
-      break;
-
-    default:
-      ui_->filter->setText(ui_->filter->text() + event->text());
-      break;
+  if (ui_->toolbar->isVisible()) {
+    ui_->filter->setFocus();
+    switch (event->key()) {
+      case Qt::Key_Backspace:
+        break;
+      case Qt::Key_Escape:
+        ui_->filter->clear();
+        break;
+      default:
+        ui_->filter->setText(ui_->filter->text() + event->text());
+        break;
+    }
   }
 
 }