diff --git a/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp b/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp
index 1edef668e..f2ad70bdc 100644
--- a/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp
+++ b/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp
@@ -299,7 +299,7 @@ static string OptionalFlagString(EnumType e)
 
 static string DefaultIDName(uint32_t ID)
 {
-	return StringFormat::Fmt("{%u}", ID);
+	return StringFormat::Fmt("_%u_", ID);
 }
 
 template<typename T>
diff --git a/renderdocui/Windows/ShaderViewer.cs b/renderdocui/Windows/ShaderViewer.cs
index 3b2bc4b2b..254473f71 100644
--- a/renderdocui/Windows/ShaderViewer.cs
+++ b/renderdocui/Windows/ShaderViewer.cs
@@ -1034,11 +1034,6 @@ namespace renderdocui.Windows
 
                 string pattern = "\\b" + word + "\\b";
 
-                // if a number is selected, highlight the matching ID
-                uint dummy = 0;
-                if (uint.TryParse(word, out dummy))
-                    pattern = "\\{" + word + "\\}";
-
                 var matches = Regex.Matches(scintilla1.Text, pattern);
 
                 foreach (Match m in matches)