diff --git a/reactos/subsys/system/notepad/dialog.c b/reactos/subsys/system/notepad/dialog.c
index d1dc2dd8418..17476aa60b9 100644
--- a/reactos/subsys/system/notepad/dialog.c
+++ b/reactos/subsys/system/notepad/dialog.c
@@ -263,7 +263,7 @@ VOID DIALOG_FileNew(VOID)
 {
     static const WCHAR empty_strW[] = { 0 };
 
-    /* Close any files and promt to save changes */
+    /* Close any files and prompt to save changes */
     if (DoCloseFile()) {
         SetWindowText(Globals.hEdit, empty_strW);
         SendMessage(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0);
diff --git a/reactos/subsys/system/notepad/main.c b/reactos/subsys/system/notepad/main.c
index 8857dfd6dbf..0c9a800aa57 100644
--- a/reactos/subsys/system/notepad/main.c
+++ b/reactos/subsys/system/notepad/main.c
@@ -194,7 +194,7 @@ static BOOL NOTEPAD_FindNext(FINDREPLACE *pFindReplace, BOOL bReplace, BOOL bSho
             LoadString(Globals.hInstance, STRING_CANNOTFIND, szResource, SIZEOF(szResource));
             _sntprintf(szText, SIZEOF(szText), szResource, pFindReplace->lpstrFindWhat);
             LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, SIZEOF(szResource));
-            MessageBox(Globals.hEdit, szText, szResource, MB_OK);
+            MessageBox(Globals.hFindReplaceDlg, szText, szResource, MB_OK);
 		}
         bSuccess = FALSE;
 	}
diff --git a/reactos/subsys/system/notepad/rsrc.rc b/reactos/subsys/system/notepad/rsrc.rc
index bb34cafb7aa..5dabcf987bb 100644
--- a/reactos/subsys/system/notepad/rsrc.rc
+++ b/reactos/subsys/system/notepad/rsrc.rc
@@ -30,6 +30,8 @@ ID_ACCEL ACCELERATORS
     "^A", CMD_SELECT_ALL
     "^C", CMD_COPY
     "^F", CMD_SEARCH
+    "^G", CMD_GOTO
+    "^H", CMD_REPLACE
     "^O", CMD_OPEN
     "^S", CMD_SAVE
     "^V", CMD_PASTE