diff --git a/src/actions.cpp b/src/actions.cpp
index 09bd4721..6fc22609 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -2020,7 +2020,10 @@ void ApplyFilter::Run()
 	
 	std::string filter = f->currentFilter();
  	if (filter.empty())
+	{
+		myPlaylist->Items->clearFilterResults();
 		ShowMessage("Filtering disabled");
+	}
  	else
 		ShowMessage("Using filter \"%s\"", filter.c_str());
 	
diff --git a/src/playlist.cpp b/src/playlist.cpp
index e58074a0..7094a67a 100644
--- a/src/playlist.cpp
+++ b/src/playlist.cpp
@@ -379,7 +379,6 @@ MPD::SongList Playlist::getSelectedSongs()
 
 /***********************************************************************/
 
-
 bool Playlist::isFiltered()
 {
 	if (Items->isFiltered())