diff --git a/desmume/src/windows/ramwatch.cpp b/desmume/src/windows/ramwatch.cpp
index e2c38be3b..cf62df56d 100644
--- a/desmume/src/windows/ramwatch.cpp
+++ b/desmume/src/windows/ramwatch.cpp
@@ -189,7 +189,7 @@ bool InsertWatch(const AddressWatcher& Watch, HWND parent)
 
 	rswatches[WatchCount] = Watch;
 	rswatches[WatchCount].CurValue = GetCurrentValue(rswatches[WatchCount]);
-//	DialogBox(hAppInst, MAKEINTRESOURCE(IDD_PROMPT), parent, (DLGPROC) PromptWatchNameProc); TODO
+	DialogBox(hAppInst, MAKEINTRESOURCE(IDD_PROMPT), parent, (DLGPROC) PromptWatchNameProc);
 
 	return WatchCount > prevWatchCount;
 }
diff --git a/desmume/src/windows/resource.h b/desmume/src/windows/resource.h
index 610b7136a..f1708a408 100644
--- a/desmume/src/windows/resource.h
+++ b/desmume/src/windows/resource.h
@@ -195,6 +195,7 @@
 #define ID_WATCHES_UPDOWN                       966
 #define IDD_RAMWATCH                            967
 #define IDR_ACCELERATOR1                        968
+#define IDD_PROMPT                              970
 #define IDC_C_WATCH_UP                          980
 #define IDD_EDITWATCH                           980
 #define IDC_C_WATCH_DOWN                        981
diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc
index 6f83406c6..82ada8c55 100644
--- a/desmume/src/windows/resources.rc
+++ b/desmume/src/windows/resources.rc
@@ -1272,6 +1272,19 @@ FONT 8, "MS Sans Serif", 0, 0, 1
 
 
 
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+IDD_PROMPT DIALOG 0, 0, 186, 68
+STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_FIXEDSYS | WS_VISIBLE | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU
+CAPTION "Input Prompt"
+FONT 8, "Ms Shell Dlg 2"
+{
+    DEFPUSHBUTTON   "OK", IDOK, 100, 43, 50, 14, BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Cancel", IDCANCEL, 37, 42, 50, 14, BS_PUSHBUTTON
+    EDITTEXT        IDC_PROMPT_EDIT, 10, 15, 167, 14, ES_AUTOHSCROLL
+}
+
+
+
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 IDD_EDITWATCH DIALOGEX 0, 0, 181, 95
 STYLE DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU
@@ -3068,7 +3081,7 @@ CAPTION "OAM Fremviser"
 FONT 8, "MS Sans Serif", 0, 0, 1
 {
     COMBOBOX        IDC_SCR_SELECT, 4, 4, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWNLIST
-    SCROLLBAR       IDC_SCROLLER, 48, 20, 20, 14, NOT WS_VISIBLE
+    SCROLLBAR       IDC_SCROLLER, 48, 20, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE
     LTEXT           "Mode :", IDC_STATIC, 4, 36, 45, 8, SS_LEFT
     LTEXT           "Tile :", IDC_STATIC, 4, 46, 45, 8, SS_LEFT
     LTEXT           "Palette :", IDC_STATIC, 4, 56, 45, 8, SS_LEFT
@@ -3104,7 +3117,7 @@ CAPTION "OAM Viewer"
 FONT 8, "MS Sans Serif", 0, 0, 1
 {
     COMBOBOX        IDC_SCR_SELECT, 4, 4, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWNLIST
-    SCROLLBAR       IDC_SCROLLER, 48, 20, 20, 14, NOT WS_VISIBLE
+    SCROLLBAR       IDC_SCROLLER, 48, 20, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE
     LTEXT           "Mode :", IDC_STATIC, 4, 36, 45, 8, SS_LEFT
     LTEXT           "Tile :", IDC_STATIC, 4, 46, 45, 8, SS_LEFT
     LTEXT           "Palette :", IDC_STATIC, 4, 56, 45, 8, SS_LEFT
@@ -3140,7 +3153,7 @@ CAPTION "OAM Viewer"
 FONT 8, "MS Sans Serif", 0, 0, 1
 {
     COMBOBOX        IDC_SCR_SELECT, 4, 4, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWNLIST
-    SCROLLBAR       IDC_SCROLLER, 48, 20, 20, 14, NOT WS_VISIBLE
+    SCROLLBAR       IDC_SCROLLER, 48, 20, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE
     LTEXT           "Mode :", IDC_STATIC, 4, 36, 45, 8, SS_LEFT
     LTEXT           "Tile :", IDC_STATIC, 4, 46, 45, 8, SS_LEFT
     LTEXT           "Palette :", IDC_STATIC, 4, 56, 45, 8, SS_LEFT
@@ -3177,7 +3190,7 @@ FONT 8, "MS Sans Serif", 0, 0, 1
 {
     COMBOBOX        IDC_PAL_SELECT, 15, 3, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN
     LTEXT           "Pal : 0", IDC_PALNUM, 3, 21, 25, 8, SS_LEFT
-    SCROLLBAR       IDC_SCROLLER, 30, 18, 20, 14, NOT WS_VISIBLE
+    SCROLLBAR       IDC_SCROLLER, 30, 18, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE
     PUSHBUTTON      "&Luk", IDC_FERMER, 35, 169, 50, 14, BS_PUSHBUTTON
     AUTOCHECKBOX    "&Auto-update", IDC_AUTO_UPDATE, 13, 150, 54, 14, BS_AUTOCHECKBOX
     EDITTEXT        IDC_AUTO_UPDATE_SECS, 68, 151, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY
@@ -3195,7 +3208,7 @@ FONT 8, "MS Sans Serif", 0, 0, 1
 {
     COMBOBOX        IDC_PAL_SELECT, 15, 3, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN
     LTEXT           "Pal : 0", IDC_PALNUM, 3, 21, 25, 8, SS_LEFT
-    SCROLLBAR       IDC_SCROLLER, 30, 18, 20, 14, NOT WS_VISIBLE
+    SCROLLBAR       IDC_SCROLLER, 30, 18, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE
     PUSHBUTTON      "&Close", IDC_FERMER, 35, 169, 50, 14, BS_PUSHBUTTON
     AUTOCHECKBOX    "&Auto-update", IDC_AUTO_UPDATE, 13, 150, 54, 14, BS_AUTOCHECKBOX
     EDITTEXT        IDC_AUTO_UPDATE_SECS, 68, 151, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY
@@ -3213,7 +3226,7 @@ FONT 8, "MS Sans Serif", 0, 0, 1
 {
     COMBOBOX        IDC_PAL_SELECT, 15, 3, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN
     LTEXT           "Pal : 0", IDC_PALNUM, 3, 21, 25, 8, SS_LEFT
-    SCROLLBAR       IDC_SCROLLER, 30, 18, 20, 14, NOT WS_VISIBLE
+    SCROLLBAR       IDC_SCROLLER, 30, 18, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE
     PUSHBUTTON      "&Fermer", IDC_FERMER, 35, 169, 50, 14, BS_PUSHBUTTON
     AUTOCHECKBOX    "&Auto-update", IDC_AUTO_UPDATE, 13, 150, 54, 14, BS_AUTOCHECKBOX
     EDITTEXT        IDC_AUTO_UPDATE_SECS, 68, 151, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY
@@ -3385,7 +3398,7 @@ FONT 8, "MS Sans Serif", 0, 0, 1
 {
     COMBOBOX        IDC_PAL_SELECT, 4, 13, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN
     LTEXT           "Pal : 0", IDC_PALNUM, 4, 31, 25, 8, SS_LEFT
-    SCROLLBAR       IDC_SCROLLER, 30, 28, 20, 14, NOT WS_VISIBLE
+    SCROLLBAR       IDC_SCROLLER, 30, 28, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE
     COMBOBOX        IDC_MEM_SELECT, 4, 50, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN
     AUTORADIOBUTTON "Bitmap", IDC_BITMAP, 4, 68, 35, 10, WS_GROUP | WS_TABSTOP | BS_AUTORADIOBUTTON
     AUTORADIOBUTTON "256 Farver", IDC_256COUL, 4, 80, 55, 10, WS_TABSTOP | BS_AUTORADIOBUTTON
@@ -3410,7 +3423,7 @@ FONT 8, "MS Sans Serif", 0, 0, 1
 {
     COMBOBOX        IDC_PAL_SELECT, 4, 13, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN
     LTEXT           "Pal : 0", IDC_PALNUM, 4, 31, 25, 8, SS_LEFT
-    SCROLLBAR       IDC_SCROLLER, 30, 28, 20, 14, NOT WS_VISIBLE
+    SCROLLBAR       IDC_SCROLLER, 30, 28, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE
     COMBOBOX        IDC_MEM_SELECT, 4, 50, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN
     AUTORADIOBUTTON "Bitmap", IDC_BITMAP, 4, 68, 35, 10, WS_GROUP | WS_TABSTOP | BS_AUTORADIOBUTTON
     AUTORADIOBUTTON "256 colors", IDC_256COUL, 4, 80, 55, 10, WS_TABSTOP | BS_AUTORADIOBUTTON
@@ -3435,7 +3448,7 @@ FONT 8, "MS Sans Serif", 0, 0, 1
 {
     COMBOBOX        IDC_PAL_SELECT, 4, 13, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN
     LTEXT           "Pal : 0", IDC_PALNUM, 4, 31, 25, 8, SS_LEFT
-    SCROLLBAR       IDC_SCROLLER, 30, 28, 20, 14, NOT WS_VISIBLE
+    SCROLLBAR       IDC_SCROLLER, 30, 28, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE
     COMBOBOX        IDC_MEM_SELECT, 4, 50, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN
     AUTORADIOBUTTON "Bitmap", IDC_BITMAP, 4, 68, 35, 10, WS_GROUP | WS_TABSTOP | BS_AUTORADIOBUTTON
     AUTORADIOBUTTON "256 couleurs", IDC_256COUL, 4, 80, 55, 10, WS_TABSTOP | BS_AUTORADIOBUTTON