diff --git a/src/media_library.cpp b/src/media_library.cpp
index bd82a85d..d6371e5a 100644
--- a/src/media_library.cpp
+++ b/src/media_library.cpp
@@ -487,7 +487,7 @@ void MediaLibrary::mouseButtonPressed(MEVENT me)
 		}
 		return result;
 	};
-	if (!Tags.empty() && Tags.hasCoords(me.x, me.y))
+	if (Tags.hasCoords(me.x, me.y))
 	{
 		if (!tryPreviousColumn() || !tryPreviousColumn())
 			return;
@@ -502,7 +502,7 @@ void MediaLibrary::mouseButtonPressed(MEVENT me)
 		Albums.clear();
 		Songs.clear();
 	}
-	else if (!Albums.empty() && Albums.hasCoords(me.x, me.y))
+	else if (Albums.hasCoords(me.x, me.y))
 	{
 		if (!isActiveWindow(Albums))
 		{
@@ -524,7 +524,7 @@ void MediaLibrary::mouseButtonPressed(MEVENT me)
 			Screen<WindowType>::mouseButtonPressed(me);
 		Songs.clear();
 	}
-	else if (!Songs.empty() && Songs.hasCoords(me.x, me.y))
+	else if (Songs.hasCoords(me.x, me.y))
 	{
 		if (!tryNextColumn() || !tryNextColumn())
 			return;
diff --git a/src/playlist_editor.cpp b/src/playlist_editor.cpp
index 611a70cd..252416dc 100644
--- a/src/playlist_editor.cpp
+++ b/src/playlist_editor.cpp
@@ -227,7 +227,7 @@ int PlaylistEditor::windowTimeout()
 
 void PlaylistEditor::mouseButtonPressed(MEVENT me)
 {
-	if (!Playlists.empty() && Playlists.hasCoords(me.x, me.y))
+	if (Playlists.hasCoords(me.x, me.y))
 	{
 		if (!isActiveWindow(Playlists))
 		{
@@ -246,7 +246,7 @@ void PlaylistEditor::mouseButtonPressed(MEVENT me)
 			Screen<WindowType>::mouseButtonPressed(me);
 		Content.clear();
 	}
-	else if (!Content.empty() && Content.hasCoords(me.x, me.y))
+	else if (Content.hasCoords(me.x, me.y))
 	{
 		if (!isActiveWindow(Content))
 		{