diff --git a/src/tag_editor.cpp b/src/tag_editor.cpp
index 2df6a203..a5c43b44 100644
--- a/src/tag_editor.cpp
+++ b/src/tag_editor.cpp
@@ -458,13 +458,9 @@ void TagEditor::EnterPressed()
 			}
 			else if (success)
 			{
-				for (std::list<std::string>::iterator it = Patterns.begin(); ; ++it)
-				{
+				for (std::list<std::string>::iterator it = Patterns.begin(); it != Patterns.end(); ++it)
 					if (*it == Config.pattern)
-						it = Patterns.erase(it);
-					if (it == Patterns.end())
-						break;
-				}
+						--(it = Patterns.erase(it));
 				Patterns.insert(Patterns.begin(), Config.pattern);
 				quit = 1;
 			}