diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp
index a45863b0..f24d5b1e 100644
--- a/src/ncmpcpp.cpp
+++ b/src/ncmpcpp.cpp
@@ -1277,6 +1277,9 @@ int main(int argc, char *argv[])
 #				ifdef HAVE_TAGLIB_H
 				case csTagEditor:
 				{
+					if (mEditorTags->Empty())
+						break;
+					
 					if (wCurrent == mEditorDirs)
 					{
 						TagList test;