diff --git a/desmume/src/windows/resource.h b/desmume/src/windows/resource.h
index 75ca17812..c73460442 100644
--- a/desmume/src/windows/resource.h
+++ b/desmume/src/windows/resource.h
@@ -69,6 +69,24 @@ void refreshAll();
 #define IDM_STATE_LOAD      150
 #define IDM_STATE_SAVE      151
 
+#define IDC_COMBO1          160
+#define IDC_COMBO2          161
+#define IDC_COMBO3          162
+#define IDC_COMBO4          163
+#define IDC_COMBO5          164
+#define IDC_COMBO6          165
+#define IDC_COMBO7          166
+#define IDC_COMBO8          167
+#define IDC_COMBO9          168
+#define IDC_COMBO10         169
+#define IDC_COMBO11         170
+#define IDC_COMBO12         171
+#define IDC_COMBO13         172
+
+#define IDC_BUTTON1         173
+#define IDM_CONFIG          180
+#define IDD_CONFIG          181
+
 #define IDD_MEM_VIEWER      301
 #define IDC_8_BIT           302
 #define IDC_16_BIT          303
diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc
index ec2882bf1..c96182044 100644
--- a/desmume/src/windows/resources.rc
+++ b/desmume/src/windows/resources.rc
@@ -310,6 +310,7 @@ MENU_PRINCIPAL MENU
  }
  POPUP "&Tools"
  {
+  MENUITEM "Config", IDM_CONFIG
   MENUITEM "&Disassembler", IDM_DISASSEMBLER
   MENUITEM "View &Memory", IDM_MEMORY
   MENUITEM "View &Registers", IDM_IOREG
@@ -334,6 +335,50 @@ MENU_PRINCIPAL MENU
  }
 }
 
+IDD_CONFIG DIALOG DISCARDABLE  0, 0, 177, 161
+STYLE DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUP | WS_CAPTION
+CAPTION "Configure Controls"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDC_FERMER,120,140,50,14
+    COMBOBOX        IDC_COMBO1,65,45,48,127,CBS_DROPDOWNLIST | WS_VSCROLL | 
+                    WS_TABSTOP
+    LTEXT           "Key-Pad:",IDC_STATIC,10,45,28,8
+    LTEXT           "D-Pad:",IDC_STATIC,10,10,22,8
+    LTEXT           "Start:",IDC_STATIC,10,80,18,8
+    LTEXT           "L:",IDC_STATIC,120,80,8,8
+    LTEXT           "R:",IDC_STATIC,65,80,8,8
+    LTEXT           "Select:",IDC_STATIC,10,105,24,8
+    LTEXT           "Debug:",IDC_STATIC,65,104,24,8
+    PUSHBUTTON      "Default",IDC_BUTTON1,5,140,50,14
+    COMBOBOX        IDC_COMBO2,10,60,48,127,CBS_DROPDOWNLIST | WS_VSCROLL | 
+                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO3,120,60,48,127,CBS_DROPDOWNLIST | WS_VSCROLL | 
+                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO4,65,60,48,127,CBS_DROPDOWNLIST | WS_VSCROLL | 
+                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO5,65,10,48,127,CBS_DROPDOWNLIST | WS_VSCROLL | 
+                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO6,10,25,48,127,CBS_DROPDOWNLIST | WS_VSCROLL | 
+                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO7,120,25,48,127,CBS_DROPDOWNLIST | WS_VSCROLL | 
+                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO8,65,25,48,127,CBS_DROPDOWNLIST | WS_VSCROLL | 
+                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO9,10,90,48,127,CBS_DROPDOWNLIST | WS_VSCROLL | 
+                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO10,120,90,48,127,CBS_DROPDOWNLIST | WS_VSCROLL | 
+                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO11,65,90,48,127,CBS_DROPDOWNLIST | WS_VSCROLL | 
+                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO12,10,115,48,127,CBS_DROPDOWNLIST | WS_VSCROLL | 
+                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO13,65,114,48,127,CBS_DROPDOWNLIST | WS_VSCROLL | 
+                    WS_TABSTOP
+    GROUPBOX        "",IDC_STATIC,5,0,165,135
+END
+
+
 IDD_MEM_VIEWER DIALOG DISCARDABLE  0, 0, 428, 178
 STYLE   WS_SYSMENU
 CAPTION "View Memory"