diff --git a/src/browser.cpp b/src/browser.cpp
index cb193f11..d621a3fe 100644
--- a/src/browser.cpp
+++ b/src/browser.cpp
@@ -72,7 +72,12 @@ void Browser::Resize()
 void Browser::SwitchTo()
 {
 	if (myScreen == this)
+	{
+#		ifndef WIN32
+		myBrowser->ChangeBrowseMode();
+#		endif // !WIN32
 		return;
+	}
 	
 	if (!isInitialized)
 		Init();
diff --git a/src/help.cpp b/src/help.cpp
index 2f21287e..ed0449c8 100644
--- a/src/help.cpp
+++ b/src/help.cpp
@@ -229,7 +229,7 @@ void Help::GetKeybindings()
 	*w << DisplayKeys(Key.EditTags)			<< "Rename playlist/directory\n";
 #	endif // HAVE_TAGLIB_H
 	if (Mpd.GetHostname()[0] == '/') // are we connected to unix socket?
-		*w << DisplayKeys(Key.SwitchTagTypeList)<< "Browse MPD database/local filesystem\n";
+		*w << DisplayKeys(Key.Browser)		<< "Browse MPD database/local filesystem\n";
 	*w << DisplayKeys(Key.GoToNowPlaying)		<< "Locate currently playing song\n";
 	*w << DisplayKeys(Key.GoToParentDir)		<< "Go to parent directory\n";
 	*w << DisplayKeys(Key.Delete)			<< "Delete playlist/file/directory\n";
diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp
index a273953e..b31408f1 100644
--- a/src/ncmpcpp.cpp
+++ b/src/ncmpcpp.cpp
@@ -1808,12 +1808,6 @@ int main(int argc, char *argv[])
 				if (number && Mpd.AddRandomSongs(number))
 					ShowMessage("%zu random song%s added to playlist!", number, number == 1 ? "" : "s");
 			}
-#			ifndef WIN32
-			else if (myScreen == myBrowser)
-			{
-				myBrowser->ChangeBrowseMode();
-			}
-#			endif // !WIN32
 			else if (myScreen->ActiveWindow() == myLibrary->Artists
 			||	 (myLibrary->Columns() == 2 && myScreen->ActiveWindow() == myLibrary->Albums))
 			{