diff --git a/manifest.json b/manifest.json
index 426bb920..e321791c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
   "name": "JDN — Page Object Generator",
   "description": "JDN – helps Test Automation Engineer to create Page Objects in the test automation framework and speed up test development",
   "devtools_page": "index.html",
-  "version": "3.15.17",
+  "version": "3.15.18",
   "icons": {
     "128": "icon128.png"
   },
diff --git a/package-lock.json b/package-lock.json
index 68314369..d7f56370 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "jdn-ai-chrome-extension",
-  "version": "3.15.17",
+  "version": "3.15.18",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 459c9864..2b9dac86 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jdn-ai-chrome-extension",
-  "version": "3.15.17",
+  "version": "3.15.18",
   "description": "jdn-ai chrome extension",
   "scripts": {
     "start": "webpack --watch --env devenv",
diff --git a/src/pageServices/contentScripts/contextmenu.js b/src/pageServices/contentScripts/contextmenu.js
index f6bc48b1..6fc1760e 100644
--- a/src/pageServices/contentScripts/contextmenu.js
+++ b/src/pageServices/contentScripts/contextmenu.js
@@ -524,7 +524,10 @@ export const runContextMenu = () => {
           elementMenu.hide();
           return sendMessage({
             message: ScriptMsg.ElementSelect,
-            param: _element,
+            param: {
+              chosenElem: _element,
+              otherElems: predictedElements,
+            },
           });
         },
       },
diff --git a/src/pageServices/scriptMessageHandler.ts b/src/pageServices/scriptMessageHandler.ts
index 3c6cf022..d1e632fd 100644
--- a/src/pageServices/scriptMessageHandler.ts
+++ b/src/pageServices/scriptMessageHandler.ts
@@ -51,7 +51,8 @@ export const updateMessageHandler = (
       copyLocator(framework, value, pageObjectName, option)();
     },
     [ScriptMsg.ElementSelect]: (payload) => {
-      dispatch(elementSetActive(payload.element_id));
+      dispatch(elementGroupUnsetActive(payload.otherElems));
+      dispatch(elementSetActive(payload.chosenElem));
     },
     [ScriptMsg.ElementGroupSetActive]: (payload) => {
       const locators = payload.map((jdnHash: string) => selectLocatorByJdnHash(state, jdnHash));