diff --git a/src/gui/info_menue.cpp b/src/gui/info_menue.cpp
index efbdb47a7..bf76991a4 100644
--- a/src/gui/info_menue.cpp
+++ b/src/gui/info_menue.cpp
@@ -58,10 +58,10 @@ int CInfoMenu::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
 {
 	printf("[neutrino] CInfoMenu %s: init...\n",__FUNCTION__);
 	int   res = menu_return::RETURN_REPAINT;
-		
+
 	if (parent != NULL)
 		parent->hide();
-	
+
 	showMenu();
 
 	return res;
@@ -79,8 +79,8 @@ void CInfoMenu::showMenu()
 	info->addIntroItems();
 	info->addItem(new CMenuForwarder(LOCALE_SERVICEMENU_IMAGEINFO,  true, NULL, new CImageInfo(), NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED ), false);
 	info->addItem(new CMenuForwarder(LOCALE_EXTRA_DBOXINFO, 	true, NULL, new CDBoxInfoWidget, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
-	info->addItem(new CMenuForwarder(LOCALE_STREAMINFO_HEAD, 	true, NULL, new CStreamInfo2Handler(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW));
-		
+	info->addItem(new CMenuForwarder(LOCALE_STREAMINFO_HEAD, 	true, NULL, new CStreamInfo2(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW));
+
 	info->exec(NULL, "");
 	info->hide();
 	selected = info->getSelected();
diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp
index ba0b79c58..55e733494 100644
--- a/src/gui/streaminfo2.cpp
+++ b/src/gui/streaminfo2.cpp
@@ -109,13 +109,11 @@ CStreamInfo2::~CStreamInfo2 ()
 	ts_close();
 }
 
-int CStreamInfo2::exec()
+void CStreamInfo2::exec()
 {
 	paint(paint_mode);
 	doSignalStrengthLoop();
 	hide();
-
-	return menu_return::RETURN_EXIT_ALL;
 }
 
 int CStreamInfo2::exec (CMenuTarget * parent, const std::string &)
@@ -127,7 +125,7 @@ int CStreamInfo2::exec (CMenuTarget * parent, const std::string &)
 	paint (paint_mode);
 	doSignalStrengthLoop ();
 	hide ();
-	return menu_return::RETURN_EXIT_ALL;
+	return menu_return::RETURN_REPAINT;
 }
 
 int CStreamInfo2::doSignalStrengthLoop ()
@@ -199,7 +197,7 @@ int CStreamInfo2::doSignalStrengthLoop ()
 			if(snrscale && sigscale)
 				showSNR ();
 			if(pmt_version != current_pmt_version && delay_counter > delay){
-				current_pmt_version = pmt_version; 
+				current_pmt_version = pmt_version;
 				paint_techinfo (x + 10, y+ hheight +5);
 			}
 			delay_counter++;
@@ -282,7 +280,7 @@ void CStreamInfo2::paint_signal_fe_box(int _x, int _y, int w, int h)
 	int y1;
 	int xd = w/4;
 	std::string tuner_name = g_Locale->getText(LOCALE_STREAMINFO_SIGNAL);
-	tuner_name += ": "; 
+	tuner_name += ": ";
 	tuner_name += CFrontend::getInstance()->getInfo()->name;
 	g_Font[font_small]->RenderString(_x, _y+iheight+15, width-10, tuner_name.c_str(), COL_INFOBAR, 0, true);
 
@@ -891,7 +889,7 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos)
 		}
 	}
 	int spaceoffset = 0 ;
-	  
+
 	for(i=0 ; i<11; i++){
 		if(caids[i] == true)
 			if(spaceoffset < array[i])
@@ -971,7 +969,7 @@ int CStreamInfo2::ts_setup ()
 	vpid = g_RemoteControl->current_PIDs.PIDs.vpid;
 	if(g_RemoteControl->current_PIDs.APIDs.size() > 0)
 		apid = g_RemoteControl->current_PIDs.APIDs[g_RemoteControl->current_PIDs.PIDs.selected_apid].pid;
-	
+
 	if(vpid == 0 && apid == 0)
 		return -1;
 
diff --git a/src/gui/streaminfo2.h b/src/gui/streaminfo2.h
index a6d40a334..21cafc63e 100644
--- a/src/gui/streaminfo2.h
+++ b/src/gui/streaminfo2.h
@@ -103,7 +103,7 @@ class CStreamInfo2 : public CMenuTarget
 
 		CStreamInfo2();
 		~CStreamInfo2();
-		int exec();
+		void exec();
 
 		void hide();
 		int exec(CMenuTarget* parent, const std::string & actionKey);