diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c
index 3345893b134..04e0f5d5b1b 100644
--- a/programs/winhelp/hlpfile.c
+++ b/programs/winhelp/hlpfile.c
@@ -287,7 +287,7 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath)
     DWORD       ref = 0x0C;
     unsigned    index, old_index, offset, len, offs;
 
-    hFile = OpenFile(lpszPath, &ofs, OF_READ | OF_SEARCH);
+    hFile = OpenFile(lpszPath, &ofs, OF_READ);
     if (hFile == HFILE_ERROR) return FALSE;
 
     ret = HLPFILE_ReadFileToBuffer(hFile);
diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c
index ea230082b83..28f591d1972 100644
--- a/programs/winhelp/winhelp.c
+++ b/programs/winhelp/winhelp.c
@@ -164,6 +164,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show)
     MSG         msg;
     LONG        lHash = 0;
     HLPFILE*    hlpfile;
+    CHAR*       quote;
 
     Globals.hInstance = hInstance;
     
@@ -207,6 +208,11 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show)
     WINHELP_RegisterWinClasses();
     if (*cmdline)
     {
+        if ((*cmdline == '"') && (quote = strchr(cmdline+1, '"')))
+        {
+            cmdline++;
+            *quote = '\0';
+        }
         hlpfile = WINHELP_LookupHelpFile(cmdline);
         if (!hlpfile) return 0;
     }