diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/SignatureParsing.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/SignatureParsing.java
index e247d4ce4ade..bb30a0d52867 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/SignatureParsing.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/SignatureParsing.java
@@ -129,6 +129,14 @@ public class SignatureParsing {
             if(standAlone$) {
               canonicalText.append('$');
               break;
+            } else if (signature.getIndex() + 1 < signature.getEndIndex()) {
+              char next = signature.next();
+              signature.previous();
+              standAlone$ = !StringUtil.isJavaIdentifierPart(next); // $;
+              if(standAlone$) {
+                canonicalText.append('$');
+                break;
+              }
             }
           }
         case '/':