diff --git a/src/shared/qscripthighlighter/qscriptindenter.cpp b/src/shared/qscripthighlighter/qscriptindenter.cpp
index c697e16c69b07524c49313f6fb44a56fb6ae04d3..4ca6ebf4e1770baf9f7e730a6e6c5307d9b6a7b0 100644
--- a/src/shared/qscripthighlighter/qscriptindenter.cpp
+++ b/src/shared/qscripthighlighter/qscriptindenter.cpp
@@ -226,8 +226,10 @@ QString QScriptIndenter::trimmedCodeLine(const QString &t)
             int e = token.length;
 
             if (token.offset > 0 || startState == 0) {
-                trimmed.append(QLatin1String("/*"));
-                i += 2;
+                if (token.length >= 2 && t.midRef(token.offset, 2) == QLatin1String("/*")) {
+                    trimmed.append(QLatin1String("/*"));
+                    i += 2;
+                }
             }
 
             bool needEndOfComment = false;