diff --git a/src/win/languages/en-US.rc b/src/win/languages/en-US.rc
index 4f05cb841..e08aad513 100644
--- a/src/win/languages/en-US.rc
+++ b/src/win/languages/en-US.rc
@@ -321,7 +321,7 @@ BEGIN
                     LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,7,100,212
     CONTROL         "",-1,"Static",SS_BLACKFRAME | SS_SUNKEN,1,226,373,1
     LTEXT           "Language:",IDT_1700,7,237,41,10
-    COMBOBOX        IDC_COMBO_LANG,48,236,108,120,CBS_DROPDOWN | WS_VSCROLL | 
+    COMBOBOX        IDC_COMBO_LANG,48,236,108,120,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP
 END
 
diff --git a/src/win/languages/hu-HU.rc b/src/win/languages/hu-HU.rc
index 3514d391e..bd9e7425a 100644
--- a/src/win/languages/hu-HU.rc
+++ b/src/win/languages/hu-HU.rc
@@ -324,7 +324,7 @@ BEGIN
                     LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,7,100,212
     CONTROL         "",-1,"Static",SS_BLACKFRAME | SS_SUNKEN,1,226,373,1
     LTEXT           "Nyelv:",IDT_1700,7,237,41,10
-    COMBOBOX        IDC_COMBO_LANG,48,236,108,120,CBS_DROPDOWN | WS_VSCROLL | 
+    COMBOBOX        IDC_COMBO_LANG,48,236,108,120,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP
 END
 
diff --git a/src/win/win_settings.c b/src/win/win_settings.c
index c760302e0..e46037e4d 100644
--- a/src/win/win_settings.c
+++ b/src/win/win_settings.c
@@ -318,12 +318,19 @@ settings_msgbox_ex(int flags, void *header, void *message, void *btn1, void *btn
     return(i);
 }
 
+int enum_helper = -1, c = 0;
+
 BOOL CALLBACK 
 EnumResLangProc(HMODULE hModule, LPCTSTR lpszType, LPCTSTR lpszName, WORD wIDLanguage, LONG_PTR lParam)
 {
 	wchar_t temp[LOCALE_NAME_MAX_LENGTH + 1];
 	LCIDToLocaleName(wIDLanguage, temp, LOCALE_NAME_MAX_LENGTH, 0);
 	SendMessage((HWND)lParam, CB_ADDSTRING, 0, (LPARAM)temp);
+	
+	if (wIDLanguage == temp_language)
+		enum_helper = c;
+	
+	c++;
 	return 1;
 }
 
@@ -331,8 +338,13 @@ EnumResLangProc(HMODULE hModule, LPCTSTR lpszType, LPCTSTR lpszName, WORD wIDLan
 static void
 win_fill_languages(HWND hdlg)
 {
-	SendMessage(GetDlgItem(hdlg, IDC_COMBO_LANG), CB_GETCURSEL, 0, 0);
-	EnumResourceLanguages(hinstance, RT_MENU, L"MainMenu", &EnumResLangProc, (LPARAM)GetDlgItem(hdlg, IDC_COMBO_LANG));
+	temp_language = GetThreadUILanguage();
+	HWND lang_combo = GetDlgItem(hdlg, IDC_COMBO_LANG); 
+	
+	SendMessage(lang_combo, CB_RESETCONTENT, 0, 0);
+	EnumResourceLanguages(hinstance, RT_MENU, L"MainMenu", &EnumResLangProc, (LPARAM)lang_combo);
+	
+	SendMessage(lang_combo, CB_SETCURSEL, enum_helper, 0);
 }
 
 /* This does the initial read of global variables into the temporary ones. */