diff --git a/grammars/csharp.tmLanguage b/grammars/csharp.tmLanguage
index a3a0042..7b1967c 100644
--- a/grammars/csharp.tmLanguage
+++ b/grammars/csharp.tmLanguage
@@ -5207,7 +5207,7 @@
       <key>conditional-operator</key>
       <dict>
         <key>begin</key>
-        <string>(?&lt;!\?)\?(?!\?|\.|\[)</string>
+        <string>(?&lt;!\?\s*)\?(?!\?|\.|\[)</string>
         <key>beginCaptures</key>
         <dict>
           <key>0</key>
diff --git a/grammars/csharp.tmLanguage.cson b/grammars/csharp.tmLanguage.cson
index 4eb17bb..9de0861 100644
--- a/grammars/csharp.tmLanguage.cson
+++ b/grammars/csharp.tmLanguage.cson
@@ -3159,7 +3159,7 @@ repository:
       }
     ]
   "conditional-operator":
-    begin: "(?<!\\?)\\?(?!\\?|\\.|\\[)"
+    begin: "(?<!\\?\\s*)\\?(?!\\?|\\.|\\[)"
     beginCaptures:
       "0":
         name: "keyword.operator.conditional.question-mark.cs"
diff --git a/src/csharp.tmLanguage.yml b/src/csharp.tmLanguage.yml
index 4ed0472..4d2e63a 100644
--- a/src/csharp.tmLanguage.yml
+++ b/src/csharp.tmLanguage.yml
@@ -2035,7 +2035,7 @@ repository:
     # Only match ? if:
     # 1. There isn't a preceding or trailing ? (null-coalescing operator)
     # 2. There isn't a trailing . or [ (null-conditional operator)
-    begin: (?<!\?)\?(?!\?|\.|\[)
+    begin: (?<!\?\s*)\?(?!\?|\.|\[)
     beginCaptures:
       '0': { name: keyword.operator.conditional.question-mark.cs }
     end: ':'