diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc
index b9d2c6c2877..aa456d2f5b5 100644
--- a/programs/winecfg/Bg.rc
+++ b/programs/winecfg/Bg.rc
@@ -240,7 +240,7 @@ BEGIN
     IDS_DLL_BUILTIN_NATIVE  "��������, ���������"
     IDS_DLL_DISABLED        "���������"
     IDS_DEFAULT_SETTINGS    "Default Settings"
-    IDS_EXECUTABLE_FILTER   "Wine Programs (*.exe,*.exe.so)\0*.exe;*.exe.so\0"
+    IDS_EXECUTABLE_FILTER   "Wine Programs (*.exe,*.exe.so)"
     IDS_USE_GLOBAL_SETTINGS "Use global settings"
     IDS_SELECT_EXECUTABLE   "Select an executable file"
 END
diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc
index aefbd5cd05b..ccfd63dbbea 100644
--- a/programs/winecfg/Cs.rc
+++ b/programs/winecfg/Cs.rc
@@ -240,7 +240,7 @@ BEGIN
     IDS_DLL_BUILTIN_NATIVE  "vestav�n�, nativn�"
     IDS_DLL_DISABLED        "zak�zat"
     IDS_DEFAULT_SETTINGS    "Standardn� nastaven�"
-    IDS_EXECUTABLE_FILTER   "Programy Wine (*.exe,*.exe.so)\0*.exe;*.exe.so\0"
+    IDS_EXECUTABLE_FILTER   "Programy Wine (*.exe,*.exe.so)"
     IDS_USE_GLOBAL_SETTINGS "Pou��t v�eobecn� nastaven�"
     IDS_SELECT_EXECUTABLE   "Zvolte spustiteln� soubor"
 END
diff --git a/programs/winecfg/Da.rc b/programs/winecfg/Da.rc
index f6e5ac0b2d0..27d504c88d9 100644
--- a/programs/winecfg/Da.rc
+++ b/programs/winecfg/Da.rc
@@ -247,7 +247,7 @@ BEGIN
     IDS_DLL_BUILTIN_NATIVE  "indbygget, indfødt"
     IDS_DLL_DISABLED        "disabled"
     IDS_DEFAULT_SETTINGS    "Standard indstillinger"
-    IDS_EXECUTABLE_FILTER   "Wine programmer (*.exe,*.exe.so)\0*.exe;*.exe.so\0"
+    IDS_EXECUTABLE_FILTER   "Wine programmer (*.exe,*.exe.so)"
     IDS_USE_GLOBAL_SETTINGS "Brug globale indstillinger"
     IDS_SELECT_EXECUTABLE   "Vælg en program fil"
 END
diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc
index 953dddaac2d..4ffbc90a85e 100644
--- a/programs/winecfg/De.rc
+++ b/programs/winecfg/De.rc
@@ -246,7 +246,7 @@ BEGIN
     IDS_DLL_BUILTIN_NATIVE  "Builtin, Native"
     IDS_DLL_DISABLED        "ausgeschaltet"
     IDS_DEFAULT_SETTINGS    "Standardeinstellungen"
-    IDS_EXECUTABLE_FILTER   "Wine-Programme (*.exe,*.exe.so)\0*.exe;*.exe.so\0"
+    IDS_EXECUTABLE_FILTER   "Wine-Programme (*.exe,*.exe.so)"
     IDS_USE_GLOBAL_SETTINGS "Globale Einstellung benutzen"
     IDS_SELECT_EXECUTABLE   "Ausführbares Programm auswählen"
 END 
diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc
index a252f35c862..5c5e285cee5 100644
--- a/programs/winecfg/En.rc
+++ b/programs/winecfg/En.rc
@@ -246,7 +246,7 @@ BEGIN
     IDS_DLL_BUILTIN_NATIVE  "builtin, native"
     IDS_DLL_DISABLED        "disabled"
     IDS_DEFAULT_SETTINGS    "Default Settings"
-    IDS_EXECUTABLE_FILTER   "Wine Programs (*.exe,*.exe.so)\0*.exe;*.exe.so\0"
+    IDS_EXECUTABLE_FILTER   "Wine Programs (*.exe,*.exe.so)"
     IDS_USE_GLOBAL_SETTINGS "Use global settings"
     IDS_SELECT_EXECUTABLE   "Select an executable file"
 END
diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc
index 1fb363a71b7..2aab8e30c56 100644
--- a/programs/winecfg/Es.rc
+++ b/programs/winecfg/Es.rc
@@ -245,7 +245,7 @@ BEGIN
     IDS_DLL_BUILTIN_NATIVE  "interna, nativa"
     IDS_DLL_DISABLED        "deshabilitada"
     IDS_DEFAULT_SETTINGS    "Configuraci�n por defecto"
-    IDS_EXECUTABLE_FILTER   "Programas Wine (*.exe,*.exe.so)\0*.exe;*.exe.so\0"
+    IDS_EXECUTABLE_FILTER   "Programas Wine (*.exe,*.exe.so)"
     IDS_USE_GLOBAL_SETTINGS "Usar la configuraci�n global"
     IDS_SELECT_EXECUTABLE   "Seleccione un fichero ejecutable"
 END
diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc
index a09c3e7bb13..36132169887 100644
--- a/programs/winecfg/Fi.rc
+++ b/programs/winecfg/Fi.rc
@@ -234,7 +234,7 @@ BEGIN
     IDS_DLL_BUILTIN_NATIVE  "sis�inen, natiivi"
     IDS_DLL_DISABLED        "ei k�yt�ss�"
     IDS_DEFAULT_SETTINGS    "Default Settings"
-    IDS_EXECUTABLE_FILTER   "Wine Programs (*.exe,*.exe.so)\0*.exe;*.exe.so\0"
+    IDS_EXECUTABLE_FILTER   "Wine Programs (*.exe,*.exe.so)"
     IDS_USE_GLOBAL_SETTINGS "Use global settings"
     IDS_SELECT_EXECUTABLE   "Select an executable file"
 END
diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc
index 93e8b5d56f1..e29aa3cd599 100644
--- a/programs/winecfg/Fr.rc
+++ b/programs/winecfg/Fr.rc
@@ -248,7 +248,7 @@ BEGIN
     IDS_DLL_BUILTIN_NATIVE  "intégrée, native"
     IDS_DLL_DISABLED        "désactivée"
     IDS_DEFAULT_SETTINGS    "Paramètres par défaut"
-    IDS_EXECUTABLE_FILTER   "Programmes de Wine (*.exe,*.exe.so)\0*.exe;*.exe.so\0"
+    IDS_EXECUTABLE_FILTER   "Programmes de Wine (*.exe,*.exe.so)"
     IDS_USE_GLOBAL_SETTINGS "Utiliser les paramètres globaux"
     IDS_SELECT_EXECUTABLE   "Sélectionnez un fichier exécutable"
 END
diff --git a/programs/winecfg/Hu.rc b/programs/winecfg/Hu.rc
index 41943877665..602ecc280bc 100644
--- a/programs/winecfg/Hu.rc
+++ b/programs/winecfg/Hu.rc
@@ -234,7 +234,7 @@ BEGIN
     IDS_DLL_BUILTIN_NATIVE  "be�p�tett, nat�v"
     IDS_DLL_DISABLED        "letiltva"
     IDS_DEFAULT_SETTINGS    "Default Settings"
-    IDS_EXECUTABLE_FILTER   "Wine Programs (*.exe,*.exe.so)\0*.exe;*.exe.so\0"
+    IDS_EXECUTABLE_FILTER   "Wine Programs (*.exe,*.exe.so)"
     IDS_USE_GLOBAL_SETTINGS "Use global settings"
     IDS_SELECT_EXECUTABLE   "Select an executable file"
 END
diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc
index b81987cf787..5cbac1ce002 100644
--- a/programs/winecfg/It.rc
+++ b/programs/winecfg/It.rc
@@ -248,7 +248,7 @@ BEGIN
     IDS_DLL_BUILTIN_NATIVE  "integrata, nativa"
     IDS_DLL_DISABLED        "disabilitato"
     IDS_DEFAULT_SETTINGS    "Impostazioni predefinite"
-    IDS_EXECUTABLE_FILTER   "Programmi di Wine (*.exe,*.exe.so)\0*.exe;*.exe.so\0"
+    IDS_EXECUTABLE_FILTER   "Programmi di Wine (*.exe,*.exe.so)"
     IDS_USE_GLOBAL_SETTINGS "Usa impostazioni globali"
     IDS_SELECT_EXECUTABLE   "Seleziona un file eseguibile"
 END
diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc
index adacd09a16e..2c0b7f51ca1 100644
--- a/programs/winecfg/Ja.rc
+++ b/programs/winecfg/Ja.rc
@@ -249,7 +249,7 @@ BEGIN
     IDS_DLL_BUILTIN_NATIVE  "builtin, native"
     IDS_DLL_DISABLED        "無効"
     IDS_DEFAULT_SETTINGS    "既定の設定"
-    IDS_EXECUTABLE_FILTER   "Wine プログラム (*.exe,*.exe.so)\0*.exe;*.exe.so\0"
+    IDS_EXECUTABLE_FILTER   "Wine プログラム (*.exe,*.exe.so)"
     IDS_USE_GLOBAL_SETTINGS "全体設定を使う"
     IDS_SELECT_EXECUTABLE   "実行可能ファイルを選択"
 END
diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc
index b8729460709..08a211b4724 100644
--- a/programs/winecfg/Ko.rc
+++ b/programs/winecfg/Ko.rc
@@ -250,7 +250,7 @@ BEGIN
     IDS_DLL_BUILTIN_NATIVE  "내장, 네이티브"
     IDS_DLL_DISABLED        "사용하지 않음"
     IDS_DEFAULT_SETTINGS    "기본 설정"
-    IDS_EXECUTABLE_FILTER   "Wine 프로그램 (*.exe,*.exe.so)\0*.exe;*.exe.so\0"
+    IDS_EXECUTABLE_FILTER   "Wine 프로그램 (*.exe,*.exe.so)"
     IDS_USE_GLOBAL_SETTINGS "전체 설정 사용"
     IDS_SELECT_EXECUTABLE   "실행 파일 선택"
 END
diff --git a/programs/winecfg/Lt.rc b/programs/winecfg/Lt.rc
index 6cd10abfa92..fccfa66291f 100644
--- a/programs/winecfg/Lt.rc
+++ b/programs/winecfg/Lt.rc
@@ -247,7 +247,7 @@ BEGIN
     IDS_DLL_BUILTIN_NATIVE  "įtaisyta, sava"
     IDS_DLL_DISABLED        "išjungta"
     IDS_DEFAULT_SETTINGS    "Numatytosios nuostatos"
-    IDS_EXECUTABLE_FILTER   "Wine programos (*.exe,*.exe.so)\0*.exe;*.exe.so\0"
+    IDS_EXECUTABLE_FILTER   "Wine programos (*.exe,*.exe.so)"
     IDS_USE_GLOBAL_SETTINGS "Naudoti globalias nuostatas"
     IDS_SELECT_EXECUTABLE   "Pasirinkite vykdomąjį failą"
 END
diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc
index e1021a724db..cfa6cc80929 100644
--- a/programs/winecfg/Nl.rc
+++ b/programs/winecfg/Nl.rc
@@ -248,7 +248,7 @@ BEGIN
     IDS_DLL_BUILTIN_NATIVE  "builtin, native"
     IDS_DLL_DISABLED        "uitgeschakeld"
     IDS_DEFAULT_SETTINGS    "Standaardinstellingen"
-    IDS_EXECUTABLE_FILTER   "Wine toepassingen (*.exe,*.exe.so)\0*.exe;*.exe.so\0"
+    IDS_EXECUTABLE_FILTER   "Wine toepassingen (*.exe,*.exe.so)"
     IDS_USE_GLOBAL_SETTINGS "Gebruik globale instellingen"
     IDS_SELECT_EXECUTABLE   "Selecteer een uitvoerbaar bestand"
 END
diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc
index befde028c66..efff7491dbe 100644
--- a/programs/winecfg/No.rc
+++ b/programs/winecfg/No.rc
@@ -247,7 +247,7 @@ END
     IDS_DLL_BUILTIN_NATIVE  "innebygget, innfødt"
     IDS_DLL_DISABLED        "slått av"
     IDS_DEFAULT_SETTINGS    "Globale innstillinger"
-    IDS_EXECUTABLE_FILTER   "Wine-programmer (*.exe,*.exe.so)\0*.exe;*.exe.so\0"
+    IDS_EXECUTABLE_FILTER   "Wine-programmer (*.exe,*.exe.so)"
     IDS_USE_GLOBAL_SETTINGS "Bruk globale innstillinger"
     IDS_SELECT_EXECUTABLE   "Velg en programfil"
 END
diff --git a/programs/winecfg/Pl.rc b/programs/winecfg/Pl.rc
index c2c6c56507e..8cf6e5d4de6 100644
--- a/programs/winecfg/Pl.rc
+++ b/programs/winecfg/Pl.rc
@@ -248,7 +248,7 @@ BEGIN
     IDS_DLL_BUILTIN_NATIVE  "wbudowana, zewn�trzna"
     IDS_DLL_DISABLED        "wy��czona"
     IDS_DEFAULT_SETTINGS    "Ustawienia standardowe"
-    IDS_EXECUTABLE_FILTER   "Programy Wine (*.exe,*.exe.so)\0*.exe;*.exe.so\0"
+    IDS_EXECUTABLE_FILTER   "Programy Wine (*.exe,*.exe.so)"
     IDS_USE_GLOBAL_SETTINGS "U�yj ustawie� globalnych"
     IDS_SELECT_EXECUTABLE   "Wybierz plik wykonywalny"
 END
diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc
index c41dd0e9a19..212e51054d3 100644
--- a/programs/winecfg/Pt.rc
+++ b/programs/winecfg/Pt.rc
@@ -501,7 +501,7 @@ BEGIN
     IDS_DLL_BUILTIN_NATIVE  "embutida, nativa"
     IDS_DLL_DISABLED        "desativada"
     IDS_DEFAULT_SETTINGS    "Configurações Padrão"
-    IDS_EXECUTABLE_FILTER   "Programas Wine (*.exe,*.exe.so)\0*.exe;*.exe.so\0"
+    IDS_EXECUTABLE_FILTER   "Programas Wine (*.exe,*.exe.so)"
     IDS_USE_GLOBAL_SETTINGS "Usar configurações globais"
     IDS_SELECT_EXECUTABLE   "Selecione um arquivo executável"
 END
diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc
index ae56087cd26..8508953f6ec 100644
--- a/programs/winecfg/Ro.rc
+++ b/programs/winecfg/Ro.rc
@@ -246,7 +246,7 @@ BEGIN
     IDS_DLL_BUILTIN_NATIVE  "builtin, native"
     IDS_DLL_DISABLED        "dezactivat"
     IDS_DEFAULT_SETTINGS    "Setări implicite"
-    IDS_EXECUTABLE_FILTER   "Programe Wine (*.exe,*.exe.so)\0*.exe;*.exe.so\0"
+    IDS_EXECUTABLE_FILTER   "Programe Wine (*.exe,*.exe.so)"
     IDS_USE_GLOBAL_SETTINGS "Folosește setările globale"
     IDS_SELECT_EXECUTABLE   "Selectează un fișier executabil"
 END
diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc
index df0d51c61b8..3f611a04f09 100644
--- a/programs/winecfg/Ru.rc
+++ b/programs/winecfg/Ru.rc
@@ -251,7 +251,7 @@ BEGIN
     IDS_DLL_BUILTIN_NATIVE      "встроенная, сторонняя"
     IDS_DLL_DISABLED            "отключена"
     IDS_DEFAULT_SETTINGS        "Установки по умолчанию"
-    IDS_EXECUTABLE_FILTER       "Программы Wine (*.exe,*.exe.so)\0*.exe;*.exe.so\0"
+    IDS_EXECUTABLE_FILTER       "Программы Wine (*.exe,*.exe.so)"
     IDS_USE_GLOBAL_SETTINGS     "Использовать по умолчанию"
     IDS_SELECT_EXECUTABLE       "Выберите исполняемый файл"
 END
diff --git a/programs/winecfg/Si.rc b/programs/winecfg/Si.rc
index 22eb0a61dc6..ac09b385f02 100644
--- a/programs/winecfg/Si.rc
+++ b/programs/winecfg/Si.rc
@@ -246,7 +246,7 @@ BEGIN
     IDS_DLL_BUILTIN_NATIVE  "vgrajeno, izvorno"
     IDS_DLL_DISABLED        "onemogočeno"
     IDS_DEFAULT_SETTINGS    "Privzete (sistemske) nastavitve"
-    IDS_EXECUTABLE_FILTER   "Wine programi (*.exe,*.exe.so)\0*.exe;*.exe.so\0"
+    IDS_EXECUTABLE_FILTER   "Wine programi (*.exe,*.exe.so)"
     IDS_USE_GLOBAL_SETTINGS "Uporabi sistemske nastavitve"
     IDS_SELECT_EXECUTABLE   "Izberite izvršljivo datoteko"
 END
diff --git a/programs/winecfg/Sr.rc b/programs/winecfg/Sr.rc
index 5636c11e63e..1e39865a2bf 100644
--- a/programs/winecfg/Sr.rc
+++ b/programs/winecfg/Sr.rc
@@ -247,7 +247,7 @@ BEGIN
     IDS_DLL_BUILTIN_NATIVE  "builtin, native"
     IDS_DLL_DISABLED        "isključen"
     IDS_DEFAULT_SETTINGS    "Osnovno podešavanje"
-    IDS_EXECUTABLE_FILTER   "Wine programi (*.exe,*.exe.so)\\0*.exe;*.exe.so\\0"
+    IDS_EXECUTABLE_FILTER   "Wine programi (*.exe,*.exe.so)"
     IDS_USE_GLOBAL_SETTINGS "Koristi globalna podešavanja"
     IDS_SELECT_EXECUTABLE   "Izaberi izvršni fajl"
 END
diff --git a/programs/winecfg/Sv.rc b/programs/winecfg/Sv.rc
index 4d9df3a1fc7..4bee68b886e 100644
--- a/programs/winecfg/Sv.rc
+++ b/programs/winecfg/Sv.rc
@@ -244,7 +244,7 @@ BEGIN
     IDS_DLL_BUILTIN_NATIVE  "inbyggd, ursprunglig"
     IDS_DLL_DISABLED        "inaktiverad"
     IDS_DEFAULT_SETTINGS    "Standardinst�llningar"
-    IDS_EXECUTABLE_FILTER   "Wine-program (*.exe,*.exe.so)\0*.exe;*.exe.so\0"
+    IDS_EXECUTABLE_FILTER   "Wine-program (*.exe,*.exe.so)"
     IDS_USE_GLOBAL_SETTINGS "Anv�nd globala inst�llningar"
     IDS_SELECT_EXECUTABLE   "V�lj en k�rbar fil"
 END
diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc
index e273abac591..1a45d013e90 100644
--- a/programs/winecfg/Tr.rc
+++ b/programs/winecfg/Tr.rc
@@ -234,7 +234,7 @@ BEGIN
     IDS_DLL_BUILTIN_NATIVE  "yerle�ik, do�al"
     IDS_DLL_DISABLED        "devre d���"
     IDS_DEFAULT_SETTINGS    "�ntan�ml� Ayarlar"
-    IDS_EXECUTABLE_FILTER   "Wine Programlar� (*.exe,*.exe.so)\0*.exe;*.exe.so\0"
+    IDS_EXECUTABLE_FILTER   "Wine Programlar� (*.exe,*.exe.so)"
     IDS_USE_GLOBAL_SETTINGS "Genel ayarlar� kullan"
     IDS_SELECT_EXECUTABLE   "�al��t�r�labilir bir dosya se�in"
 END
diff --git a/programs/winecfg/Uk.rc b/programs/winecfg/Uk.rc
index 82a387c25b4..de7c4ad74f0 100644
--- a/programs/winecfg/Uk.rc
+++ b/programs/winecfg/Uk.rc
@@ -250,7 +250,7 @@ BEGIN
     IDS_DLL_BUILTIN_NATIVE  "вбудована, стороння"
     IDS_DLL_DISABLED        "вимкнено"
     IDS_DEFAULT_SETTINGS    "Стандартні налаштування"
-    IDS_EXECUTABLE_FILTER   "Програми Wine (*.exe,*.exe.so)\0*.exe;*.exe.so\0"
+    IDS_EXECUTABLE_FILTER   "Програми Wine (*.exe,*.exe.so)"
     IDS_USE_GLOBAL_SETTINGS "Використати глобальні параметри"
     IDS_SELECT_EXECUTABLE   "Виберіть виконуваний файл"
 END
diff --git a/programs/winecfg/Zh.rc b/programs/winecfg/Zh.rc
index d3371b8f1a2..123a194b346 100644
--- a/programs/winecfg/Zh.rc
+++ b/programs/winecfg/Zh.rc
@@ -249,7 +249,7 @@ BEGIN
     IDS_DLL_BUILTIN_NATIVE  "内建先于原装"
     IDS_DLL_DISABLED        "停用"
     IDS_DEFAULT_SETTINGS    "默认设置"
-    IDS_EXECUTABLE_FILTER   "Wine 程序 (*.exe,*.exe.so)\0*.exe;*.exe.so\0"
+    IDS_EXECUTABLE_FILTER   "Wine 程序 (*.exe,*.exe.so)"
     IDS_USE_GLOBAL_SETTINGS "使用全局设置"
     IDS_SELECT_EXECUTABLE   "选择可执行文件"
 END
diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c
index 2b35aebd852..6101c48740a 100644
--- a/programs/winecfg/appdefaults.c
+++ b/programs/winecfg/appdefaults.c
@@ -29,6 +29,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
+#include "wine/unicode.h"
 #include "winecfg.h"
 #include "resource.h"
 
@@ -311,9 +312,10 @@ static BOOL list_contains_file(HWND listview, WCHAR *filename)
 
 static void on_add_app_click(HWND dialog)
 {
+  static const WCHAR filterW[] = {'%','s','%','c','*','.','e','x','e',';','*','.','e','x','e','.','s','o','%','c',0};
   WCHAR filetitle[MAX_PATH];
   WCHAR file[MAX_PATH];
-  WCHAR programsFilter[100];
+  WCHAR programsFilter[100], filter[MAX_PATH];
   WCHAR selectExecutableStr[100];
   static const WCHAR pathC[] = { 'c',':','\\',0 };
 
@@ -327,9 +329,10 @@ static void on_add_app_click(HWND dialog)
       sizeof(selectExecutableStr)/sizeof(selectExecutableStr[0]));
   LoadStringW (GetModuleHandle (NULL), IDS_EXECUTABLE_FILTER, programsFilter,
       sizeof(programsFilter)/sizeof(programsFilter[0]));
+  snprintfW( filter, MAX_PATH, filterW, programsFilter, 0, 0 );
 
   ofn.lpstrTitle = selectExecutableStr;
-  ofn.lpstrFilter = programsFilter;
+  ofn.lpstrFilter = filter;
   ofn.lpstrFileTitle = filetitle;
   ofn.lpstrFileTitle[0] = '\0';
   ofn.nMaxFileTitle = sizeof(filetitle)/sizeof(filetitle[0]);