diff --git a/src/gui/hdd_info.cpp b/src/gui/hdd_info.cpp
index f8feafe1d..ad6bfb4ea 100644
--- a/src/gui/hdd_info.cpp
+++ b/src/gui/hdd_info.cpp
@@ -128,7 +128,9 @@ int CHDDInfoMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 				} else
 					doLoop = false;
 			}
-			else if((msg == CRCInput::RC_sat) || (msg == CRCInput::RC_favorites)) {
+			else if (CNeutrinoApp::getInstance()->listModeKey(msg))
+			{
+				// do nothing
 			}
 			else
 			{
diff --git a/src/gui/imageinfo_ni.cpp b/src/gui/imageinfo_ni.cpp
index 36fe29a22..f5769a66b 100644
--- a/src/gui/imageinfo_ni.cpp
+++ b/src/gui/imageinfo_ni.cpp
@@ -165,7 +165,7 @@ int CImageInfoNI::exec(CMenuTarget* parent, const std::string &)
 			res = menu_return::RETURN_EXIT_ALL;
 			break;
 		}
-		else if((msg == CRCInput::RC_sat) || (msg == CRCInput::RC_favorites)) {
+		else if (CNeutrinoApp::getInstance()->listModeKey(msg)) {
 			g_RCInput->postMsg (msg, 0);
 			res = menu_return::RETURN_EXIT_ALL;
 			break;