diff --git a/src/gui/imageinfo.cpp b/src/gui/imageinfo.cpp
index 15dd92544..8dd342ed8 100644
--- a/src/gui/imageinfo.cpp
+++ b/src/gui/imageinfo.cpp
@@ -49,7 +49,6 @@
 #include <nhttpd/yconfig.h>
 
 #define VERSION_FILE TARGET_PREFIX "/.version"
-#define Y_VERSION_FILE DATADIR "/neutrino/httpd/Y_Version.txt"
 
 using namespace std;
 
@@ -310,7 +309,7 @@ void CImageInfo::InitInfoData()
 	s_api	+= ", ";
 #endif
 	s_api	+= "yWeb ";
-	s_api	+= getYApi();
+	s_api	+= getYWebVersion();
 	s_api	+= ", ";
 	s_api	+= HTTPD_NAME;
 	s_api	+= + " ";
@@ -462,12 +461,9 @@ void CImageInfo::hide()
 	}
 }
 
-string CImageInfo::getYApi()
+string CImageInfo::getYWebVersion()
 {
-	string ret;
-	config.loadConfig(Y_VERSION_FILE);
-	ret = config.getString("version", "n/a");
-	config.loadConfig(VERSION_FILE);
-	return ret;
+	CConfigFile yV('=', false);
+	yV.loadConfig(PRIVATE_HTTPDDIR "/Y_Version.txt");
+	return yV.getString("version", "n/a");
 }
-
diff --git a/src/gui/imageinfo.h b/src/gui/imageinfo.h
index 9d6e399f8..0449b7591 100644
--- a/src/gui/imageinfo.h
+++ b/src/gui/imageinfo.h
@@ -63,7 +63,7 @@ class CImageInfo : public CMenuTarget
 		std::string getLicenseText();
 		void ShowWindow();
 		void ScrollLic(bool scrollDown);
-		std::string getYApi();
+		std::string getYWebVersion();
 
 		CComponentsWindowMax  	*cc_win;
 		CComponentsForm  	*cc_info;
diff --git a/src/gui/scan.cpp b/src/gui/scan.cpp
index d26ea9229..26a00d41c 100644
--- a/src/gui/scan.cpp
+++ b/src/gui/scan.cpp
@@ -451,9 +451,13 @@ int CScanTs::handleMsg(neutrino_msg_t msg, neutrino_msg_data_t data)
 			break;
 		case CRCInput::RC_plus:
 		case CRCInput::RC_minus:
+			CVolume::getInstance()->setVolume(msg);
+			break;
 		case CRCInput::RC_left:
 		case CRCInput::RC_right:
-			CVolume::getInstance()->setVolume(msg);
+			if (g_settings.mode_left_right_key_tv == SNeutrinoSettings::VOLUME) {
+				CVolume::getInstance()->setVolume(msg);
+			}
 			break;
 		default:
 			break;