diff --git a/HISTORY b/HISTORY
index 6a3586c..3b54c2b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -86,3 +86,5 @@ Version 1.1.0
   (configurable in Makefile)
 - Added russian and catalan translation
 - Added slovakian translation
+- fixed channel switching with blue key if detailed epg view is opened and
+  if "close tvguide on channel switch" is configured
diff --git a/tvguideosd.c b/tvguideosd.c
index 5cccc67..344c625 100644
--- a/tvguideosd.c
+++ b/tvguideosd.c
@@ -498,8 +498,13 @@ eOSState cTvGuideOsd::ChannelSwitch() {
     const cChannel *currentChannel = activeGrid->column->getChannel();
     if (currentChannel) {
         cDevice::PrimaryDevice()->SwitchChannel(currentChannel, true);
-        if (tvguideConfig.closeOnSwitch)
+        if (tvguideConfig.closeOnSwitch) {
+            if (detailView) {
+                delete detailView;
+                detailView = NULL;
+            }
             return osEnd;
+        }
     }
     return osContinue;
 }