diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js
index 8b22fed7d..8803a2150 100644
--- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js
+++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js
@@ -765,12 +765,8 @@ function RemoteFunctions(config = {}) {
             });
         }
 
-        // we call the select element function only when the element is not editable (JS generated content)
-        // because for editable elements, highlightRule function already calls selectElement internally
-        if (!LivePreviewView.isElementEditable(element)) {
-            selectElement(element);
-        }
         brieflyDisableHoverListeners();
+        selectElement(element);
     }
 
     // remove active highlights
@@ -814,6 +810,12 @@ function RemoteFunctions(config = {}) {
         let foundValidElement = false;
         for (i = 0; i < nodes.length; i++) {
             if(LivePreviewView.isElementInspectable(nodes[i], true) && nodes[i].tagName !== "BR") {
+                // if hover lock timer is active, we don't call selectElement as,
+                // it means that its already called by handleElementClick function
+                if (_hoverLockTimer && nodes[i] === previouslyClickedElement) {
+                    foundValidElement = true;
+                    break;
+                }
                 selectElement(nodes[i]);
                 foundValidElement = true;
                 break;
diff --git a/tracking-repos.json b/tracking-repos.json
index 6dbe90bb9..43cc75b09 100644
--- a/tracking-repos.json
+++ b/tracking-repos.json
@@ -1,5 +1,5 @@
 {
   "phoenixPro": {
-    "commitID": "ec8ca8e2f0631c7440e3a4372688523406c080d2"
+    "commitID": "870dee35853dbae23647c340de67808ae4365f06"
   }
 }