diff --git a/src/tag_editor.cpp b/src/tag_editor.cpp
index e0d84516..e0fe9b41 100644
--- a/src/tag_editor.cpp
+++ b/src/tag_editor.cpp
@@ -97,11 +97,11 @@ void TagEditor::Init()
 	if (Config.titles_visibility)
 		TagTypes->AddOption("Options", 1, 1);
 	TagTypes->AddSeparator();
-	TagTypes->AddOption("Reset");
-	TagTypes->AddOption("Save");
-	TagTypes->AddSeparator();
 	TagTypes->AddOption("Capitalize First Letters");
 	TagTypes->AddOption("lower all letters");
+	TagTypes->AddSeparator();
+	TagTypes->AddOption("Reset");
+	TagTypes->AddOption("Save");
 	
 	Tags = new Menu<MPD::Song>(RightColumnStartX, MainStartY, RightColumnWidth, MainHeight, Config.titles_visibility ? "Tags" : "", Config.main_color, brNone);
 	Tags->HighlightColor(Config.main_highlight_color);
@@ -612,12 +612,26 @@ void TagEditor::EnterPressed()
 				Tags->Scroll(wDown);
 			}
 		}
-		else if (id == 12) // reset
+		else if (id == 12) // capitalize first letters
+		{
+			ShowMessage("Processing...");
+			for (MPD::SongList::iterator it = EditedSongs.begin(); it != EditedSongs.end(); ++it)
+				CapitalizeFirstLetters(**it);
+			ShowMessage("Done!");
+		}
+		else if (id == 13) // lower all letters
+		{
+			ShowMessage("Processing...");
+			for (MPD::SongList::iterator it = EditedSongs.begin(); it != EditedSongs.end(); ++it)
+				LowerAllLetters(**it);
+			ShowMessage("Done!");
+		}
+		else if (id == 14) // reset
 		{
 			Tags->Clear();
 			ShowMessage("Changes reset");
 		}
-		else if (id == 13) // save
+		else if (id == 15) // save
 		{
 			bool success = 1;
 			ShowMessage("Writing changes...");
@@ -645,20 +659,6 @@ void TagEditor::EnterPressed()
 			else
 				Tags->Clear();
 		}
-		else if (id == 14) // capitalize first letters
-		{
-			ShowMessage("Processing...");
-			for (MPD::SongList::iterator it = EditedSongs.begin(); it != EditedSongs.end(); ++it)
-				CapitalizeFirstLetters(**it);
-			ShowMessage("Done!");
-		}
-		else if (id == 15) // lower all letters
-		{
-			ShowMessage("Processing...");
-			for (MPD::SongList::iterator it = EditedSongs.begin(); it != EditedSongs.end(); ++it)
-				LowerAllLetters(**it);
-			ShowMessage("Done!");
-		}
 	}
 }