diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp
index a841b56ba..b22f28418 100644
--- a/src/gui/timerlist.cpp
+++ b/src/gui/timerlist.cpp
@@ -321,7 +321,7 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
 		else if (timerNew.eventType == CTimerd::TIMER_ZAPTO ||
 			 timerNew.eventType == CTimerd::TIMER_RECORD)
 		{
-			if (strcmp(timerNew_channel_name, "---")==0)
+			if (timerNew_channel_name == "---")
 				return menu_return::RETURN_REPAINT;
 			if (timerNew.eventType==CTimerd::TIMER_RECORD)
 			{
@@ -369,7 +369,7 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
 		       "%n",
 		       &timerNew.channel_id,
 		       &delta);
-		strncpy(timerNew_channel_name, &(key[3 + delta + 1]), 29);
+		timerNew_channel_name = std::string(key + 3 + delta + 1);
 		g_RCInput->postMsg(CRCInput::RC_timeout, 0); // leave underlying menu also
 		g_RCInput->postMsg(CRCInput::RC_timeout, 0); // leave underlying menu also
 		return menu_return::RETURN_EXIT;
@@ -1211,7 +1211,7 @@ int CTimerList::newTimer()
 	CMenuWidget mm(LOCALE_TIMERLIST_MODESELECT, NEUTRINO_ICON_SETTINGS);
 	mm.addItem(new CMenuForwarder(LOCALE_TIMERLIST_MODETV, true, NULL, &mctv));
 	mm.addItem(new CMenuForwarder(LOCALE_TIMERLIST_MODERADIO, true, NULL, &mcradio));
-	strcpy(timerNew_channel_name,"---");
+	timerNew_channel_name = "---";
 	CMenuForwarder* m6 = new CMenuForwarder(LOCALE_TIMERLIST_CHANNEL, true, timerNew_channel_name, &mm);
 
 	CMenuForwarder* m7 = new CMenuForwarder(LOCALE_TIMERLIST_RECORDING_DIR, true,timerNew.recordingDir, this, "rec_dir2", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
diff --git a/src/gui/timerlist.h b/src/gui/timerlist.h
index 067d942bb..0266c6e04 100644
--- a/src/gui/timerlist.h
+++ b/src/gui/timerlist.h
@@ -63,7 +63,7 @@ class CTimerList : public CMenuTarget
 		CTimerd::TimerList timerlist;             // List of timers		
 		CTimerd::responseGetTimer timerNew;
 		int timerNew_standby_on;
-		char timerNew_channel_name[30];
+		std::string timerNew_channel_name;
 		std::string m_weekdaysStr;
 		
 		int timer_apids_dflt;