diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp
index 5eab4ae43..3ab3c8aed 100644
--- a/src/gui/keybind_setup.cpp
+++ b/src/gui/keybind_setup.cpp
@@ -101,7 +101,7 @@ int CKeybindSetup::exec(CMenuTarget* parent, const std::string &actionKey)
 		return menu_return::RETURN_REPAINT;
 	}
 
-	showKeySetup();
+	res = showKeySetup();
 	
 	return res;
 }
@@ -163,7 +163,7 @@ const key_settings_struct_t key_settings[CKeybindSetup::KEYBINDS_COUNT] =
 };
 
 
-void CKeybindSetup::showKeySetup()
+int CKeybindSetup::showKeySetup()
 {
 	//keysetup menu
 	CMenuWidget* keySettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_KEYBINDING, width);
@@ -199,10 +199,11 @@ void CKeybindSetup::showKeySetup()
 	keySettings->addItem(new CMenuForwarder(LOCALE_USERMENU_BUTTON_YELLOW, true, NULL, new CUserMenuSetup(LOCALE_USERMENU_BUTTON_YELLOW,2), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW));
 	keySettings->addItem(new CMenuForwarder(LOCALE_USERMENU_BUTTON_BLUE, true, NULL, new CUserMenuSetup(LOCALE_USERMENU_BUTTON_BLUE,3), NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE));
 	
-	keySettings->exec(NULL, "");
+	int res = keySettings->exec(NULL, "");
 	keySettings->hide();
 	selected = keySettings->getSelected();
 	delete keySettings;
+	return res;
 }
 
 
diff --git a/src/gui/keybind_setup.h b/src/gui/keybind_setup.h
index a7a7bc3cb..517dc119d 100644
--- a/src/gui/keybind_setup.h
+++ b/src/gui/keybind_setup.h
@@ -93,7 +93,7 @@ class CKeybindSetup : public CMenuTarget
 		
 		int width, selected;
 
-		void showKeySetup();
+		int showKeySetup();
 		void showKeyBindSetup(CMenuWidget *bindSettings);
 		void showKeyBindModeSetup(CMenuWidget *bindSettings_modes);
 		void showKeyBindChannellistSetup(CMenuWidget *bindSettings_chlist);
@@ -108,4 +108,4 @@ class CKeybindSetup : public CMenuTarget
 
 
 #endif
-		
\ No newline at end of file
+		
diff --git a/src/gui/user_menue_setup.cpp b/src/gui/user_menue_setup.cpp
index 15e6c762b..a8d3b7dbe 100644
--- a/src/gui/user_menue_setup.cpp
+++ b/src/gui/user_menue_setup.cpp
@@ -91,12 +91,10 @@ int CUserMenuSetup::exec(CMenuTarget* parent, const std::string &)
 	if(parent != NULL)
 		parent->hide();
 
-	showSetup();
-	
-	return menu_return::RETURN_REPAINT;	
+	return showSetup();
 }
 
-void CUserMenuSetup::showSetup()
+int CUserMenuSetup::showSetup()
 {
 	CMenuWidget * ums = new CMenuWidget(local, NEUTRINO_ICON_KEYBINDING, width);
 
@@ -120,9 +118,9 @@ void CUserMenuSetup::showSetup()
 		ums->addItem( new CMenuOptionChooser(text, &g_settings.usermenu[button][item], USERMENU_ITEM_OPTIONS, USERMENU_ITEM_OPTION_COUNT,true ));
 	}
 
-	ums->exec(NULL, "");
+	int res = ums->exec(NULL, "");
 	ums->hide();
 	delete ums;
-
+	return res;
 }
 
diff --git a/src/gui/user_menue_setup.h b/src/gui/user_menue_setup.h
index 874312813..ff61f3dbe 100644
--- a/src/gui/user_menue_setup.h
+++ b/src/gui/user_menue_setup.h
@@ -44,7 +44,7 @@
 		int button;
 		neutrino_locale_t local;
 
-		void showSetup();
+		int showSetup();
 
 	public:
 		CUserMenuSetup(neutrino_locale_t menue_title, int menue_button);