diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b1a99f55..da80a636 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -971,6 +971,8 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for reporting a problem in setting the audio language codes in 'Transfer-Mode'
  for fixing cReadLine::Read() for lines that end with the infamous "\r\n"
  for adding a missing "Button$" for the Timer button and "Key$" in skinclassic.c
+ for reporting a bug in handling the color button texts when switching from the
+ 'Schedule' menu of a channel without EPG info to the 'What's on now' menu
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
diff --git a/HISTORY b/HISTORY
index d50ea48f..2e505f99 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4484,3 +4484,6 @@ Video Disk Recorder Revision History
 - cSkins::QueueMessage() called from a background thread with an empty message
   now clears all messages that have been previously queued by that thread and have
   not yet beed displayed (thanks to Alexander Rieger).
+- Fixed handling the color button texts when switching from the 'Schedule' menu of
+  a channel without EPG info to the 'What's on now' menu (reported by Rolf
+  Ahrenberg).
diff --git a/menu.c b/menu.c
index 4f503fb8..c7842be0 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.425 2006/03/31 12:58:26 kls Exp $
+ * $Id: menu.c 1.426 2006/04/09 12:00:15 kls Exp $
  */
 
 #include "menu.h"
@@ -1079,6 +1079,7 @@ cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentCha
          }
       }
   currentChannel = CurrentChannelNr;
+  Display();
   SetHelpKeys();
 }