diff --git a/src/tag_editor.cpp b/src/tag_editor.cpp
index d5f7b577..3d8d394f 100644
--- a/src/tag_editor.cpp
+++ b/src/tag_editor.cpp
@@ -172,7 +172,7 @@ namespace
 			result[0] = toupper(result[0]);
 		for (string::iterator it = result.begin()+1; it != result.end(); it++)
 		{
-			if (isalpha(*it) && *(it-1) == ' ')
+			if (isalpha(*it) && !isalpha(*(it-1)))
 				*it = toupper(*it);
 		}
 		return result;