diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in
index 0d98c9a0926..40c448bf227 100644
--- a/programs/notepad/Makefile.in
+++ b/programs/notepad/Makefile.in
@@ -4,7 +4,8 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = notepad.exe
 APPMODE   = gui
-IMPORTS   = comdlg32 shell32 user32 gdi32 kernel32
+IMPORTS   = comdlg32 shell32 msvcrt user32 gdi32 kernel32
+EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 
 C_SRCS = \
 	License_En.c \
diff --git a/programs/notepad/main.c b/programs/notepad/main.c
index 24293b13325..079c466a905 100644
--- a/programs/notepad/main.c
+++ b/programs/notepad/main.c
@@ -221,6 +221,11 @@ void HandleCommandLine(LPSTR cmdline)
         BOOL file_exists;
         char buf[MAX_PATH];
 
+        if (cmdline[0] == '"')
+        {
+            cmdline++;
+            cmdline[strlen(cmdline) - 1] = 0;
+        }
         if (FileExists(cmdline))
         {
             file_exists = TRUE;