diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index 28e85454c..90c9add6b 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -1347,16 +1347,20 @@ int CInfoViewer::handleMsg (const neutrino_msg_t msg, neutrino_msg_data_t data)
 		if (is_visible) showRecordIcon(true);
 	} else if (msg == NeutrinoMessages::EVT_ZAP_GOTAPIDS) {
 		if ((*(t_channel_id *) data) == current_channel_id) {
+#if 0
 			if (is_visible && showButtonBar)
 				infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_GREEN);
+#endif
 			if (g_settings.radiotext_enable && g_Radiotext && !g_RemoteControl->current_PIDs.APIDs.empty() && ((CNeutrinoApp::getInstance()->getMode()) == NeutrinoMessages::mode_radio))
 				g_Radiotext->setPid(g_RemoteControl->current_PIDs.APIDs[g_RemoteControl->current_PIDs.PIDs.selected_apid].pid);
 		}
 		return messages_return::handled;
 	} else if (msg == NeutrinoMessages::EVT_ZAP_GOT_SUBSERVICES) {
 		if ((*(t_channel_id *) data) == current_channel_id) {
+#if 0
 			if (is_visible && showButtonBar)
 				infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_YELLOW);
+#endif
 		}
 		return messages_return::handled;
 	} else if (msg == NeutrinoMessages::EVT_ZAP_SUB_COMPLETE) {
@@ -1758,6 +1762,8 @@ void CInfoViewer::show_Data (bool calledFromEvent)
 		}
 #endif
 		infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_RED);
+		infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_GREEN);
+		infoViewerBB->showBBButtons(CInfoViewerBB::BUTTON_YELLOW);
 	}
 
 	if ((info_CurrentNext.flags & CSectionsdClient::epgflags::not_broadcast) ||
diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp
index 6acc46d08..3fcafb868 100644
--- a/src/gui/infoviewer_bb.cpp
+++ b/src/gui/infoviewer_bb.cpp
@@ -313,7 +313,11 @@ void CInfoViewerBB::getBBButtonInfo()
 //			continue;
 		}
 		else
+#else
+		if (!bbButtonInfo[i].active)
+			bbButtonInfo[i].paint = false;
 #endif
+		else
 		{
 			count++;
 			bbButtonInfo[i].paint = true;