diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp
index 63d0912c8..88226cbd5 100644
--- a/src/gui/moviebrowser/mb.cpp
+++ b/src/gui/moviebrowser/mb.cpp
@@ -2584,7 +2584,7 @@ bool CMovieBrowser::onDelete(bool cursor_only)
 	MI_MOVIE_INFO *movieinfo;
 	movieinfo = NULL;
 
-	if (cursor_only)
+	if (cursor_only || (filelist.empty() || movielist.empty()))
 	{
 		filelist.clear();
 		movielist.clear();