diff --git a/.editorconfig b/.editorconfig
index 607d857cfc2..0747f14c690 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1294,8 +1294,7 @@ dotnet_diagnostic.SA0001.severity = none
 dotnet_diagnostic.SA0002.severity = none
 
 # SA1000: Spacing around keywords
-# suggestion until https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3478 is resolved
-dotnet_diagnostic.SA1000.severity = suggestion
+dotnet_diagnostic.SA1000.severity = warning
 
 # SA1001: Commas should not be preceded by whitespace
 dotnet_diagnostic.SA1001.severity = warning
diff --git a/src/Microsoft.DotNet.Wpf/src/.editorconfig b/src/Microsoft.DotNet.Wpf/src/.editorconfig
index 8c0a38efa4c..129488f2b99 100644
--- a/src/Microsoft.DotNet.Wpf/src/.editorconfig
+++ b/src/Microsoft.DotNet.Wpf/src/.editorconfig
@@ -251,6 +251,9 @@ dotnet_diagnostic.IDE0300.severity = suggestion
 # IDE1006: Naming Styles
 dotnet_diagnostic.IDE1006.severity = suggestion
 
+# SA1000: Spacing around keywords
+dotnet_diagnostic.SA1000.severity = suggestion
+
 # SA1400: Member should declare an access modifier
 dotnet_diagnostic.SA1400.severity = suggestion