diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index b87ad1a8f..09472b73b 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -757,38 +757,7 @@ int CChannelList::show()
 		}
 		else if (CRCInput::isNumeric(msg) && (this->historyMode || g_settings.sms_channel)) {
 			if (this->historyMode) { //numeric zap
-				switch (msg) {
-				case CRCInput::RC_0:
-					selected = 0;
-					break;
-				case CRCInput::RC_1:
-					selected = 1;
-					break;
-				case CRCInput::RC_2:
-					selected = 2;
-					break;
-				case CRCInput::RC_3:
-					selected = 3;
-					break;
-				case CRCInput::RC_4:
-					selected = 4;
-					break;
-				case CRCInput::RC_5:
-					selected = 5;
-					break;
-				case CRCInput::RC_6:
-					selected = 6;
-					break;
-				case CRCInput::RC_7:
-					selected = 7;
-					break;
-				case CRCInput::RC_8:
-					selected = 8;
-					break;
-				case CRCInput::RC_9:
-					selected = 9;
-					break;
-				};
+				selected = CRCInput::getNumericValue(msg);
 				zapOnExit = true;
 				loop = false;
 			}