diff --git a/plugin/core/signature_help.py b/plugin/core/signature_help.py
index 434fed68c..62a4ceb80 100644
--- a/plugin/core/signature_help.py
+++ b/plugin/core/signature_help.py
@@ -9,6 +9,7 @@
 from .views import minihtml
 import functools
 import html
+import re
 import sublime
 
 
@@ -115,7 +116,8 @@ def _render_label(self, view: sublime.View, signature: SignatureInformation) ->
                     # route relies on the client being smart enough to figure where the parameter is inside of
                     # the signature label. The above case where the label is a tuple of (start, end) positions is much
                     # more robust.
-                    start = label[prev:].find(rawlabel)
+                    label_match = re.search(r"(?<!\w){}(?!\w)".format(re.escape(rawlabel)), label[prev:])
+                    start = label_match.start() if label_match else -1
                     if start == -1:
                         debug("no match found for {}".format(rawlabel))
                         continue