diff --git a/HISTORY b/HISTORY
index b475e674..97c5986c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9079,3 +9079,5 @@ Video Disk Recorder Revision History
   Q=@ to the make call to have it less verbose (provided the plugin's Makefile
   was modified as described above).
 - Added clearing CiResourceHandlers before shutting down the plugin manager.
+- Fixed a double channel switch when pressing the Channel+/- keys while no menu
+  or channel display is open.
diff --git a/vdr.c b/vdr.c
index ea6a0cfb..4b424683 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 4.15 2017/05/29 11:10:46 kls Exp $
+ * $Id: vdr.c 4.16 2017/05/29 11:30:27 kls Exp $
  */
 
 #include <getopt.h>
@@ -1274,8 +1274,10 @@ int main(int argc, char *argv[])
           case kChanUp:
           case kChanDn|k_Repeat:
           case kChanDn:
-               if (!Interact)
+               if (!Interact) {
                   Menu = new cDisplayChannel(NORMALKEY(key));
+                  continue;
+                  }
                else if (cDisplayChannel::IsOpen() || cControl::Control()) {
                   Interact->ProcessKey(key);
                   continue;