diff --git a/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js b/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js
index 0ca55f75c..67702ce85 100644
--- a/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js
+++ b/src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js
@@ -492,10 +492,7 @@
         // Get the user's current selection
         const selection = window.getSelection();
         var element = event.target;
-        if(element && (element.closest('.phcode-no-lp-edit') || element.classList.contains('phcode-no-lp-edit-this'))) {
-            return;
-        }
-        // Check for dismiss action - dismiss LP editing when clicked
+        // Check for dismiss action first - dismiss LP editing when clicked (takes precedence over no-edit)
         if(element && (element.closest('.phcode-dismiss-lp-edit')
             || element.classList.contains('phcode-dismiss-lp-edit-this'))) {
             // dismissUIAndCleanupState is in RemoteFunctions, accessible via window._LD
@@ -506,6 +503,9 @@
             event.stopPropagation();
             return;
         }
+        if(element && (element.closest('.phcode-no-lp-edit') || element.classList.contains('phcode-no-lp-edit-this'))) {
+            return;
+        }
         if (element && element.hasAttribute('data-brackets-id')) {
             // Check if it's a double-click for direct editing
             if (event.detail === 2 && !['INPUT', 'TEXTAREA', 'SELECT'].includes(element.tagName)) {
diff --git a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js
index b70eb6f19..deb6206b5 100644
--- a/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js
+++ b/src/LiveDevelopment/BrowserScripts/RemoteFunctions.js
@@ -756,10 +756,7 @@ function RemoteFunctions(config = {}) {
      * @param {Event} event - The click event
      */
     function handleElementClick(element, event) {
-        if(element && (element.closest('.phcode-no-lp-edit') || element.classList.contains('phcode-no-lp-edit-this'))) {
-            return;
-        }
-        // Check for dismiss action - dismiss LP editing when clicked
+        // Check for dismiss action first - dismiss LP editing when clicked (takes precedence over no-edit)
         if(element && (
             element.closest('.phcode-dismiss-lp-edit') || element.classList.contains('phcode-dismiss-lp-edit-this'))) {
             dismissUIAndCleanupState();
@@ -767,6 +764,9 @@ function RemoteFunctions(config = {}) {
             event.stopPropagation();
             return;
         }
+        if(element && (element.closest('.phcode-no-lp-edit') || element.classList.contains('phcode-no-lp-edit-this'))) {
+            return;
+        }
         if (!LivePreviewView.isElementInspectable(element)) {
             dismissUIAndCleanupState();
             return;