diff --git a/HISTORY b/HISTORY
index 7858dc41..31963ce1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2646,3 +2646,5 @@ Video Disk Recorder Revision History
   value 0 (thanks to Thomas Bergwinkl).
 - Enabled switching to a channel even if it has no Vpid or Apid set, because these
   might be automatically set when tuned to that transponder.
+- No longer closing the Channels menu after trying to switch to a channel that
+  is currently not available.
diff --git a/menu.c b/menu.c
index e834db46..5b40f166 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.282 2004/01/25 14:40:00 kls Exp $
+ * $Id: menu.c 1.283 2004/02/08 14:12:23 kls Exp $
  */
 
 #include "menu.h"
@@ -723,7 +723,7 @@ eOSState cMenuChannels::Switch(void)
      return osContinue;
   cChannel *ch = GetChannel(Current());
   if (ch)
-     cDevice::PrimaryDevice()->SwitchChannel(ch, true);
+     return cDevice::PrimaryDevice()->SwitchChannel(ch, true) ? osEnd : osContinue;
   return osEnd;
 }