diff --git a/src/help.cpp b/src/help.cpp
index 51c6b49f..4fdbde53 100644
--- a/src/help.cpp
+++ b/src/help.cpp
@@ -273,6 +273,11 @@ void Help::GetKeybindings()
 	
 	
 #	ifdef HAVE_TAGLIB_H
+	*w << "\n\n   " << fmtBold << "Keys - Tiny tag editor\n -----------------------------------------\n" << fmtBoldEnd;
+	*w << DisplayKeys(Key.Enter)			<< "Edit tag\n";
+	*w << DisplayKeys(Key.ToggleSingle)		<< "Save\n";
+	
+	
 	*w << "\n\n   " << fmtBold << "Keys - Tag editor\n -----------------------------------------\n" << fmtBoldEnd;
 	*w << DisplayKeys(Key.Enter)			<< "Change tag/filename for one song (left column)\n";
 	*w << DisplayKeys(Key.Enter)			<< "Perform operation on all/selected songs (middle column)\n";
diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp
index c366d270..4f0a4351 100644
--- a/src/ncmpcpp.cpp
+++ b/src/ncmpcpp.cpp
@@ -1192,6 +1192,13 @@ int main(int argc, char *argv[])
 				mySearcher->Main()->Highlighting(1);
 				mySearcher->EnterPressed();
 			}
+#			ifdef HAVE_TAGLIB_H
+			else if (myScreen == myTinyTagEditor)
+			{
+				myTinyTagEditor->Main()->Highlight(myTinyTagEditor->Main()->Size()-2); // Save
+				myTinyTagEditor->EnterPressed();
+			}
+#			endif // HAVE_TAGLIB_H
 			else
 			{
 				Mpd.SetSingle(!Mpd.GetSingle());