diff --git a/src/gui/audioplayer_setup.cpp b/src/gui/audioplayer_setup.cpp
index 2b7036a65..23e4a8c8f 100644
--- a/src/gui/audioplayer_setup.cpp
+++ b/src/gui/audioplayer_setup.cpp
@@ -82,7 +82,7 @@ int CAudioPlayerSetup::exec(CMenuTarget* parent, const std::string &actionKey)
 		return res;
 	}
 
-	showAudioPlayerSetup();
+	res = showAudioPlayerSetup();
 	
 	return res;
 }
@@ -97,7 +97,7 @@ const CMenuOptionChooser::keyval AUDIOPLAYER_DISPLAY_ORDER_OPTIONS[AUDIOPLAYER_D
 
 
 /*shows the audio setup menue*/
-void CAudioPlayerSetup::showAudioPlayerSetup()
+int CAudioPlayerSetup::showAudioPlayerSetup()
 {
 	CMenuWidget* audioplayerSetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width);
 	audioplayerSetup->setSelected(selected);
@@ -120,8 +120,9 @@ void CAudioPlayerSetup::showAudioPlayerSetup()
 	audioplayerSetup->addItem(new CMenuForwarder(LOCALE_AUDIOPLAYER_DEFDIR, true, g_settings.network_nfs_audioplayerdir, this, "audioplayerdir"));
 	audioplayerSetup->addItem(new CMenuOptionChooser(LOCALE_AUDIOPLAYER_ENABLE_SC_METADATA, &g_settings.audioplayer_enable_sc_metadata, MESSAGEBOX_NO_YES_OPTIONS, MESSAGEBOX_NO_YES_OPTION_COUNT, true ));
 
-	audioplayerSetup->exec (NULL, "");
+	int res = audioplayerSetup->exec (NULL, "");
 	audioplayerSetup->hide ();
 	selected = audioplayerSetup->getSelected();
 	delete audioplayerSetup;
+	return res;
 }
diff --git a/src/gui/audioplayer_setup.h b/src/gui/audioplayer_setup.h
index 9fa06a369..9f54b8cd5 100644
--- a/src/gui/audioplayer_setup.h
+++ b/src/gui/audioplayer_setup.h
@@ -41,7 +41,7 @@ class CAudioPlayerSetup : public CMenuTarget
 	private:
 		int width, selected;
 
-		void showAudioPlayerSetup();
+		int showAudioPlayerSetup();
 
 
 	public:	
diff --git a/src/gui/mediaplayer_setup.cpp b/src/gui/mediaplayer_setup.cpp
index 8a15b2590..6ec6253d8 100644
--- a/src/gui/mediaplayer_setup.cpp
+++ b/src/gui/mediaplayer_setup.cpp
@@ -74,13 +74,13 @@ int CMediaPlayerSetup::exec(CMenuTarget* parent, const std::string & /*actionKey
 		parent->hide();
 
 
-	showMediaPlayerSetup();
+	res = showMediaPlayerSetup();
 	
 	return res;
 }
 
 /*shows media setup menue entries*/
-void CMediaPlayerSetup::showMediaPlayerSetup()
+int CMediaPlayerSetup::showMediaPlayerSetup()
 {
 
 	CMenuWidget* mediaSetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width);
@@ -92,9 +92,9 @@ void CMediaPlayerSetup::showMediaPlayerSetup()
 	mediaSetup->addItem(new CMenuForwarder(LOCALE_PICTUREVIEWER_HEAD, true, NULL, new CPictureViewerSetup(), "", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED));
 	mediaSetup->addItem(new CMenuForwarder(LOCALE_AUDIOPLAYER_NAME, true, NULL, new CAudioPlayerSetup(), "", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
 
-	mediaSetup->exec (NULL, "");
+	int res = mediaSetup->exec (NULL, "");
 	mediaSetup->hide ();
 	selected = mediaSetup->getSelected();
 	delete mediaSetup;
-
+	return res;
 }
diff --git a/src/gui/mediaplayer_setup.h b/src/gui/mediaplayer_setup.h
index c05757dfa..5bb763a7d 100644
--- a/src/gui/mediaplayer_setup.h
+++ b/src/gui/mediaplayer_setup.h
@@ -42,7 +42,7 @@ class CMediaPlayerSetup : public CMenuTarget
 	private:
 		int width, selected;
 
-		void showMediaPlayerSetup();
+		int showMediaPlayerSetup();
 
 
 	public:	
diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp
index a1cd53318..263339c05 100644
--- a/src/gui/miscsettings_menu.cpp
+++ b/src/gui/miscsettings_menu.cpp
@@ -117,9 +117,7 @@ int CMiscMenue::exec(CMenuTarget* parent, const std::string &actionKey)
 	}
 #endif /*ONE_KEY_PLUGIN*/
 
-	showMiscSettingsMenu();
-	
-	return menu_return::RETURN_REPAINT;	
+	return showMiscSettingsMenu();
 }
 
 
@@ -160,7 +158,7 @@ const CMenuOptionChooser::keyval_ext CPU_FREQ_OPTIONS[CPU_FREQ_OPTION_COUNT] =
 #endif /*CPU_FREQ*/
 
 //show misc settings menue
-void CMiscMenue::showMiscSettingsMenu()
+int CMiscMenue::showMiscSettingsMenu()
 {
 	//misc settings
 	fanNotifier = new CFanControlNotifier();
@@ -212,11 +210,12 @@ void CMiscMenue::showMiscSettingsMenu()
 	misc_menue->addItem( new CMenuForwarderNonLocalized("CPU", true, NULL, misc_menue_cpu, NULL, CRCInput::RC_4));
 #endif /*CPU_FREQ*/
 
-	misc_menue->exec(NULL, "");
+	int res = misc_menue->exec(NULL, "");
 	misc_menue->hide();
 	selected = misc_menue->getSelected();
 	delete fanNotifier;
 	delete misc_menue;
+	return res;
 }
 
 //general settings
diff --git a/src/gui/miscsettings_menu.h b/src/gui/miscsettings_menu.h
index 3b1bbd951..f99938f81 100644
--- a/src/gui/miscsettings_menu.h
+++ b/src/gui/miscsettings_menu.h
@@ -42,7 +42,7 @@ class CMiscMenue : public CMenuTarget
 		CFanControlNotifier *fanNotifier;
 		int width, selected;
 
-		void showMiscSettingsMenu();
+		int showMiscSettingsMenu();
 		void showMiscSettingsMenuGeneral(CMenuWidget *ms_general);
 		void showMiscSettingsMenuEnergy(CMenuWidget *ms_energy);
 		void showMiscSettingsMenuEpg(CMenuWidget *ms_epg);
diff --git a/src/gui/pictureviewer_setup.cpp b/src/gui/pictureviewer_setup.cpp
index 72d33319c..110f9b542 100644
--- a/src/gui/pictureviewer_setup.cpp
+++ b/src/gui/pictureviewer_setup.cpp
@@ -81,7 +81,7 @@ int CPictureViewerSetup::exec(CMenuTarget* parent, const std::string &actionKey)
 		return res;
 	}
 
-	showPictureViewerSetup();
+	res = showPictureViewerSetup();
 	
 	return res;
 }
@@ -97,7 +97,7 @@ const CMenuOptionChooser::keyval PICTUREVIEWER_SCALING_OPTIONS[PICTUREVIEWER_SCA
 
 
 /*shows the picviewer setup menue*/
-void CPictureViewerSetup::showPictureViewerSetup()
+int CPictureViewerSetup::showPictureViewerSetup()
 {
 
 	CMenuWidget* picviewsetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width);
@@ -111,8 +111,9 @@ void CPictureViewerSetup::showPictureViewerSetup()
 	picviewsetup->addItem(new CMenuForwarder(LOCALE_PICTUREVIEWER_SLIDE_TIME, true, g_settings.picviewer_slide_time, pic_timeout));
 	picviewsetup->addItem(new CMenuForwarder(LOCALE_PICTUREVIEWER_DEFDIR, true, g_settings.network_nfs_picturedir, this, "picturedir"));
 	
-	picviewsetup->exec(NULL, "");
+	int res = picviewsetup->exec(NULL, "");
 	picviewsetup->hide();
 	selected = picviewsetup->getSelected();
 	delete picviewsetup;
+	return res;
 }
diff --git a/src/gui/pictureviewer_setup.h b/src/gui/pictureviewer_setup.h
index 911463025..84016a78c 100644
--- a/src/gui/pictureviewer_setup.h
+++ b/src/gui/pictureviewer_setup.h
@@ -43,7 +43,7 @@ class CPictureViewerSetup : public CMenuTarget
 	private:
 		int width, selected;
 
-		void showPictureViewerSetup();
+		int showPictureViewerSetup();
 
 
 	public: