diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index 168d356a2..8f722c5f7 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -48,6 +48,7 @@
 #include <neutrino.h>
 
 #include <gui/infoviewer.h>
+#include <gui/keybind_setup.h>
 #include <gui/bouquetlist.h>
 #include <gui/widget/icons.h>
 #include <gui/widget/hintbox.h>
@@ -903,7 +904,8 @@ void CInfoViewer::loop(int fadeValue, bool show_dot ,bool fadeIn)
 
 			showIcon_16_9();
 			showIcon_Resolution();
-		} else if ( g_settings.virtual_zap_mode && ((msg == CRCInput::RC_right) || msg == CRCInput::RC_left )) {
+		} else if ((g_settings.remote_control_hardware != CKeybindSetup::REMOTECONTROL_NEO1) && 
+			   ( g_settings.virtual_zap_mode && ((msg == CRCInput::RC_right) || msg == CRCInput::RC_left ))) {
 			virtual_zap_mode = true;
 			res = messages_return::cancel_all;
 			hideIt = true;
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index d4acef29a..024f7cca0 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -3417,27 +3417,25 @@ printf("CNeutrinoApp::setVolume dx %d dy %d\n", dx, dy);
 	uint64_t timeoutEnd;
 
 	do {
-		if (msg <= CRCInput::RC_MaxRC) {
-			if ((msg == CRCInput::RC_plus) || 
-			    ((g_settings.remote_control_hardware == CKeybindSetup::REMOTECONTROL_NEO1) && 
- 			     (g_RemoteControl->subChannels.size() < 1) &&
-			     (msg == CRCInput::RC_right))) {
+		if (msg <= CRCInput::RC_MaxRC) 
+		{
+			int sub_chan_keybind = 0;
+			if (g_settings.remote_control_hardware == CKeybindSetup::REMOTECONTROL_NEO1 && g_RemoteControl->subChannels.size() < 1)
+ 			     sub_chan_keybind = 1;
+			
+			if ((msg == CRCInput::RC_plus) || (sub_chan_keybind == 1 && (msg == CRCInput::RC_right))) {
 				if (g_settings.current_volume < 100 - g_settings.current_volume_step)
 					g_settings.current_volume += g_settings.current_volume_step;
 				else
 					g_settings.current_volume = 100;
-				if(current_muted){
+				
+				if(current_muted)
 					AudioMute( false, true);
-				}
 			}
-			else if ((msg == CRCInput::RC_minus) ||
-			    ((g_settings.remote_control_hardware == CKeybindSetup::REMOTECONTROL_NEO1) && 
- 			     (g_RemoteControl->subChannels.size() < 1) &&
-			     (msg == CRCInput::RC_left))) {
+			else if ((msg == CRCInput::RC_minus) || (sub_chan_keybind == 1 && (msg == CRCInput::RC_left))) {
 				if (g_settings.current_volume > g_settings.current_volume_step)
 					g_settings.current_volume -= g_settings.current_volume_step;
-				else if ((g_settings.show_mute_icon == 1) && (g_settings.current_volume = 1))
-                                {
+				else if ((g_settings.show_mute_icon == 1) && (g_settings.current_volume = 1)) {
 					(g_settings.current_volume = 1);
 					AudioMute( true, true);
 					g_settings.current_volume = 0;