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