diff --git a/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js b/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js
index 7b62687b2..5f94be233 100644
--- a/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js
+++ b/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js
@@ -492,7 +492,7 @@
         // Get the user's current selection
         const selection = window.getSelection();
         var element = event.target;
-        if(element && element.closest('.phcode-no-lp-edit')) {
+        if(element && (element.closest('.phcode-no-lp-edit') || element.classList.contains('phcode-no-lp-edit-this'))) {
             return;
         }
         if (element && element.hasAttribute('data-brackets-id')) {
diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js
index 8d3e86231..a435747f7 100644
--- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js
+++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js
@@ -605,7 +605,7 @@ function RemoteFunctions(config = {}) {
         if(!LivePreviewView.isElementInspectable(element) || element.nodeType !== Node.ELEMENT_NODE) {
             return false;
         }
-        if(element && element.closest('.phcode-no-lp-edit')) {
+        if(element && (element.closest('.phcode-no-lp-edit') || element.classList.contains('phcode-no-lp-edit-this'))) {
             return false;
         }
 
@@ -756,7 +756,7 @@ function RemoteFunctions(config = {}) {
      * @param {Event} event - The click event
      */
     function handleElementClick(element, event) {
-        if(element && element.closest('.phcode-no-lp-edit')) {
+        if(element && (element.closest('.phcode-no-lp-edit') || element.classList.contains('phcode-no-lp-edit-this'))) {
             return;
         }
         if (!LivePreviewView.isElementInspectable(element)) {
diff --git a/tracking-repos.json b/tracking-repos.json
index b35bf2dbc..de562cdb6 100644
--- a/tracking-repos.json
+++ b/tracking-repos.json
@@ -1,5 +1,5 @@
 {
   "phoenixPro": {
-    "commitID": "1e3037019a7fc22cb492bde9b57f0b1ad315dd89"
+    "commitID": "854053fa95b3b6d9cb2b17ca72bab14223aef000"
   }
 }