diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c
index 6778f17..30dba64 100644
--- a/dlls/comdlg32/filedlg.c
+++ b/dlls/comdlg32/filedlg.c
@@ -2273,8 +2273,8 @@
             else if ( fodInfos->defext ) /* attach the default file extension*/
                 filterExt = fodInfos->defext;
 
-            /* If extension is .*, ignore it */
-            if (filterExt[0] != '*')
+            /* If extension contains a glob, ignore it */
+            if ( filterExt && !strchrW(filterExt, '*') && !strchrW(filterExt, '?') )
             {
                 /* Attach the dot*/
                 lstrcatW(lpstrPathAndFile, szwDot);