diff --git a/complete.go b/complete.go
index 99da07f..c2a107c 100644
--- a/complete.go
+++ b/complete.go
@@ -161,6 +161,9 @@ func matchPath(query string) ([]string, string) {
 			entries = append(entries, entry)
 		}
 	}
+	if !strings.HasPrefix(oldQuery, "\"") {
+		baseName = escapeFilename(baseName)
+	}
 
 	return entries, baseName
 }