diff --git a/src/libprojectM/KeyHandler.cpp b/src/libprojectM/KeyHandler.cpp
index eaf99355b..ad03135b3 100755
--- a/src/libprojectM/KeyHandler.cpp
+++ b/src/libprojectM/KeyHandler.cpp
@@ -228,6 +228,7 @@ void projectM::default_key_handler( projectMEvent event, projectMKeycode keycode
 			// Hide FPS from screen and replace it with preset name.
 			if (renderer->showpreset)
 			{
+				renderer->showsearch = false;
 				renderer->showfps = false;
 			}
 			break;
@@ -263,6 +264,7 @@ void projectM::default_key_handler( projectMEvent event, projectMKeycode keycode
 			if (isTextInputActive(true)) break; // disable when searching.
 			renderer->showmenu = !renderer->showmenu;
 			if (renderer->showmenu) {
+				renderer->showfps = false;
 				renderer->showhelp = false;
 				renderer->showstats = false;
 				populatePresetMenu();
@@ -316,6 +318,8 @@ void projectM::default_key_handler( projectMEvent event, projectMKeycode keycode
 				setShuffleEnabled(false); // disable shuffle
 				renderer->showhelp = false;
 				renderer->showstats = false;
+				renderer->showtitle = false;
+				renderer->showpreset = false;
 				renderer->showmenu = true;
 				populatePresetMenu();
 			} else {
diff --git a/src/libprojectM/Renderer/Renderer.cpp b/src/libprojectM/Renderer/Renderer.cpp
index ed5f05824..b41e2ebec 100644
--- a/src/libprojectM/Renderer/Renderer.cpp
+++ b/src/libprojectM/Renderer/Renderer.cpp
@@ -196,7 +196,7 @@ Renderer::Renderer(int width, int height, int gx, int gy, BeatDetect* _beatDetec
 		"L: Lock/Unlock Preset""\n"
 		"R: Random preset""\n"
 		"N/P: [N]ext+ or [P]revious-reset""\n"
-		"M: Preset Menu (Arrow Up/Down & Page Up/Down to Navigate)""\n"
+		"M/Return: Preset Menu (Arrow Up/Down & Page Up/Down to Navigate)""\n"
 		"Arrow Up/Down: Increase or Decrease Beat Sensitivity""\n"
 		"CTRL-F: Fullscreen";