diff --git a/src/actions.cpp b/src/actions.cpp
index 94afe8e1..c707e7d9 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -2058,15 +2058,16 @@ void ToggleFindMode::Run()
 	ShowMessage("Search mode: %s", Config.wrapped_search ? "Wrapped" : "Normal");
 }
 
-bool ToggleReplayGainMode::canBeRun() const
-{
-	return Mpd.Version() >= 16;
-}
-
 void ToggleReplayGainMode::Run()
 {
 	using Global::wFooter;
 	
+	if (Mpd.Version() < 16)
+	{
+		ShowMessage("Replay gain mode control is supported in MPD >= 0.16.0");
+		return;
+	}
+	
 	LockStatusbar();
 	Statusbar() << "Replay gain mode? [" << fmtBold << 'o' << fmtBoldEnd << "ff/" << fmtBold << 't' << fmtBoldEnd << "rack/" << fmtBold << 'a' << fmtBoldEnd << "lbum]";
 	wFooter->Refresh();
diff --git a/src/actions.h b/src/actions.h
index 9e644433..5d13551a 100644
--- a/src/actions.h
+++ b/src/actions.h
@@ -645,7 +645,6 @@ struct ToggleFindMode : public Action
 struct ToggleReplayGainMode : public Action
 {
 	ToggleReplayGainMode() : Action(aToggleReplayGainMode, "toggle_replay_gain_mode") { }
-	virtual bool canBeRun() const;
 	virtual void Run();
 };
 
diff --git a/src/browser.cpp b/src/browser.cpp
index abfb9e5b..9d2ba0af 100644
--- a/src/browser.cpp
+++ b/src/browser.cpp
@@ -515,7 +515,10 @@ void Browser::ClearDirectory(const std::string &path) const
 void Browser::ChangeBrowseMode()
 {
 	if (Mpd.GetHostname()[0] != '/')
+	{
+		ShowMessage("For browsing local filesystem connection to MPD via UNIX Socket is required");
 		return;
+	}
 	
 	itsBrowseLocally = !itsBrowseLocally;
 	ShowMessage("Browse mode: %s", itsBrowseLocally ? "Local filesystem" : "MPD database");
diff --git a/src/help.cpp b/src/help.cpp
index e461cfd7..f431d4cd 100644
--- a/src/help.cpp
+++ b/src/help.cpp
@@ -227,8 +227,7 @@ void Help::GetKeybindings()
 	KeyDesc(aToggleRandom, "Toggle random mode");
 	KeyDesc(aToggleSingle, "Toggle single mode");
 	KeyDesc(aToggleConsume, "Toggle consume mode");
-	if (Mpd.Version() >= 16)
-		KeyDesc(aToggleReplayGainMode, "Toggle replay gain mode");
+	KeyDesc(aToggleReplayGainMode, "Toggle replay gain mode");
 	KeyDesc(aToggleBitrateVisibility, "Toggle bitrate visibility");
 	KeyDesc(aShuffle, "Shuffle playlist");
 	KeyDesc(aToggleCrossfade, "Toggle crossfade mode");
@@ -291,8 +290,7 @@ void Help::GetKeybindings()
 #	endif // HAVE_TAGLIB_H
 	KeyDesc(aEditDirectoryName, "Edit directory name");
 	KeyDesc(aEditPlaylistName, "Edit playlist name");
-	if (Mpd.GetHostname()[0] == '/') // are we connected to unix socket?
-		KeyDesc(aShowBrowser, "Browse MPD database/local filesystem");
+	KeyDesc(aShowBrowser, "Browse MPD database/local filesystem");
 	KeyDesc(aToggleBrowserSortMode, "Toggle sort mode");
 	KeyDesc(aJumpToPlayingSong, "Locate playing song");
 	KeyDesc(aJumpToParentDir, "Go to parent directory");