diff --git a/desmume/src/windows/ramwatch.cpp b/desmume/src/windows/ramwatch.cpp
index f41f02326..ec569dc46 100644
--- a/desmume/src/windows/ramwatch.cpp
+++ b/desmume/src/windows/ramwatch.cpp
@@ -14,6 +14,8 @@
 
 HWND RamWatchHWnd;
 
+#define MESSAGEBOXPARENT (RamWatchHWnd ? RamWatchHWnd : MainWindow->getHWnd())
+
 char Str_Tmp[1024];
 std::string Rom_Name;
 
diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc
index 82ada8c55..2fde4cf86 100644
--- a/desmume/src/windows/resources.rc
+++ b/desmume/src/windows/resources.rc
@@ -3496,5 +3496,5 @@ IDR_ACCELERATOR1 ACCELERATORS
     "N",            RAMMENU_FILE_NEW, VIRTKEY
     "O",            RAMMENU_FILE_OPEN, VIRTKEY
     "S",            RAMMENU_FILE_SAVE, VIRTKEY
-    "S",            RAMMENU_FILE_SAVEAS, VIRTKEY
+    "S",            RAMMENU_FILE_SAVEAS, VIRTKEY, SHIFT, CONTROL, NOINVERT
 }