diff --git a/redisinsight/ui/src/pages/workbench/utils/monaco.ts b/redisinsight/ui/src/pages/workbench/utils/monaco.ts
index de7be34b2c..f110e5693a 100644
--- a/redisinsight/ui/src/pages/workbench/utils/monaco.ts
+++ b/redisinsight/ui/src/pages/workbench/utils/monaco.ts
@@ -61,7 +61,7 @@ export const getRediSearchSignutureProvider = (options: Maybe<{
     const parentToken = token.token || token.arguments?.[0]?.token
     const parentTokenPosition = parentToken ? label.indexOf(parentToken) : 0
     const wordRegex = new RegExp(`\\b${arg}\\b`, 'g')
-    const startPosition = wordRegex.exec(label.slice(parentTokenPosition))?.index || 0
+    const startPosition = (wordRegex.exec(label.slice(parentTokenPosition))?.index || 0) + parentTokenPosition
     signaturePosition = [startPosition, startPosition + arg.length]
   }
 
diff --git a/redisinsight/ui/src/pages/workbench/utils/searchSuggestions.ts b/redisinsight/ui/src/pages/workbench/utils/searchSuggestions.ts
index 0d408b170f..941b2c1b26 100644
--- a/redisinsight/ui/src/pages/workbench/utils/searchSuggestions.ts
+++ b/redisinsight/ui/src/pages/workbench/utils/searchSuggestions.ts
@@ -36,6 +36,14 @@ export const findSuggestionsByArg = (
   const { prevCursorChar } = cursor
   const [beforeOffsetArgs, [currentOffsetArg]] = args
 
+  const startCommentIndex = beforeOffsetArgs.findIndex((el) => el.startsWith('//'))
+  if (startCommentIndex > -1 || currentOffsetArg?.startsWith('//')) {
+    return {
+      suggestions: asSuggestionsRef([]),
+      helpWidget: { isOpen: false }
+    }
+  }
+
   const scopedList = command.name
     ? listOfCommands.filter(({ token }) => token === command?.name)
     : listOfCommands
diff --git a/redisinsight/ui/src/utils/monaco/monacoRedisMonarchTokensProvider.ts b/redisinsight/ui/src/utils/monaco/monacoRedisMonarchTokensProvider.ts
index ee62d07d51..fb31efa1e8 100644
--- a/redisinsight/ui/src/utils/monaco/monacoRedisMonarchTokensProvider.ts
+++ b/redisinsight/ui/src/utils/monaco/monacoRedisMonarchTokensProvider.ts
@@ -49,7 +49,7 @@ export const getRedisMonarchTokensProvider = (commands: IRedisCommand[]): monaco
       ],
       whitespace: [
         [/\s+/, 'white'],
-        [/\/\/.*$/, 'comment'],
+        [/\/\/.*/, 'comment'],
       ],
       numbers: [
         [/0[xX][0-9a-fA-F]*/, 'number'],
diff --git a/redisinsight/ui/src/utils/monaco/monarchTokens/redisearchTokensSubRedis.ts b/redisinsight/ui/src/utils/monaco/monarchTokens/redisearchTokensSubRedis.ts
index a28e4264de..55ff84ac55 100644
--- a/redisinsight/ui/src/utils/monaco/monarchTokens/redisearchTokensSubRedis.ts
+++ b/redisinsight/ui/src/utils/monaco/monarchTokens/redisearchTokensSubRedis.ts
@@ -100,7 +100,7 @@ export const getRediSearchSubRedisMonarchTokensProvider = (
         ],
         whitespace: [
           [/\s+/, 'white'],
-          [/\/\/.*$/, 'comment'],
+          [/\/\/.*/, 'comment'],
         ],
         numbers: [
           [/0[xX][0-9a-fA-F]*/, 'number'],