diff --git a/src/menu.h b/src/menu.h
index 6a9821d7..aabe9bf7 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -571,6 +571,7 @@ template <typename T> void NCurses::Menu<T>::Clear(bool clrscr)
 		delete *it;
 	itsOptions.clear();
 	itsFound.clear();
+	itsFilter.clear();
 	ClearFiltered();
 	itsOptionsPtr = &itsOptions;
 	if (clrscr)
diff --git a/src/status.cpp b/src/status.cpp
index 1d4a916c..efce8873 100644
--- a/src/status.cpp
+++ b/src/status.cpp
@@ -70,10 +70,7 @@ void StatusbarApplyFilterImmediately(const std::wstring &ws)
 {
 	static std::wstring cmp;
 	if (cmp != ws)
-	{
-		myScreen->ApplyFilter(ToString(ws));
-		cmp = ws;
-	}
+		myScreen->ApplyFilter(ToString((cmp = ws)));
 	myScreen->RefreshWindow();
 	TraceMpdStatus();
 }