diff --git a/src/gui/osdlang_setup.cpp b/src/gui/osdlang_setup.cpp
index 4fff5def4..1e4dfed26 100644
--- a/src/gui/osdlang_setup.cpp
+++ b/src/gui/osdlang_setup.cpp
@@ -62,6 +62,7 @@ COsdLangSetup::COsdLangSetup(bool wizard_mode)
 	hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
 	mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
 	height 	= hheight+13*mheight+ 10;
+	selected = -1;
 	x	= getScreenStartX (width);
 	y	= getScreenStartY (height);
 }
@@ -94,6 +95,7 @@ void COsdLangSetup::showLocalSetup()
 	//main local setup
 	CMenuWidget *localSettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_LANGUAGE, width);
 	localSettings->setWizardMode(is_wizard);
+	localSettings->setSelected(selected);
 	
 	//add subhead and back button
 	localSettings->addIntroItems(LOCALE_LANGUAGESETUP_HEAD);
@@ -118,6 +120,7 @@ void COsdLangSetup::showLocalSetup()
 	
 	localSettings->exec(NULL, "");
 	localSettings->hide();
+	selected = localSettings->getSelected();
 	delete localSettings;
 }
 
diff --git a/src/gui/osdlang_setup.h b/src/gui/osdlang_setup.h
index 8ea344824..2970651f0 100644
--- a/src/gui/osdlang_setup.h
+++ b/src/gui/osdlang_setup.h
@@ -56,7 +56,7 @@ class COsdLangSetup : public CMenuTarget, CChangeObserver
 
 		CFrameBuffer *frameBuffer;
 				
-		int x, y, width, height, menue_width, hheight, mheight;
+		int x, y, width, height, menue_width, hheight, mheight, selected;
 
 		bool is_wizard;