diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c
index 472b7cf..b1a5628 100644
--- a/dlls/hhctrl.ocx/hhctrl.c
+++ b/dlls/hhctrl.ocx/hhctrl.c
@@ -100,13 +100,22 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat
     case HH_DISPLAY_TOPIC:
     case HH_DISPLAY_TOC:
     case HH_DISPLAY_SEARCH:{
+        static const WCHAR delimW_WINTYPE[] = {'>',0};
         static const WCHAR delimW[] = {':',':',0};
         HHInfo *info;
         BOOL res;
         WCHAR chm_file[MAX_PATH];
         const WCHAR *index;
 
-        FIXME("Not all HH cases handled correctly\n");
+        FIXME("Not all HH cases handled correctly - please send WINEDEBUG=+htmlhelp trace if help does not work\n");
+
+        if (index = strstrW(filename, delimW_WINTYPE)) {
+            /* we can't process HH_WINTYPE after ">" yet, so just strip it*/
+            FIXME("unprocessed HH_WINTYPE after CHM:%s\n", debugstr_w(filename));
+            memcpy(chm_file, filename, (index-filename)*sizeof(WCHAR));
+            chm_file[index-filename] = 0;
+            filename = chm_file;
+        }
 
         index = strstrW(filename, delimW);
         if (index)