From d3130bceef81df1ac0e22780224176f2354f4746 Mon Sep 17 00:00:00 2001
From: vasyldinets <vasyld@elementor.red>
Date: Fri, 20 Feb 2026 15:17:14 +0100
Subject: [PATCH] [APP-2506] fix editor (beaver builder) conflict

---
 .../remediation/components/remediation-runner.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/modules/remediation/components/remediation-runner.php b/modules/remediation/components/remediation-runner.php
index a48c1cd0..5ce76b04 100644
--- a/modules/remediation/components/remediation-runner.php
+++ b/modules/remediation/components/remediation-runner.php
@@ -140,7 +140,22 @@ private function is_template_redirect_ajax_request(): bool {
 		return false;
 	}
 
+	private function is_builders_view(): bool {
+		// Condition used instead of direct return for feature extend
+
+		// Beaver Builder
+		if ( isset( $_GET['fl_builder'] ) || isset( $_GET['fl_builder_ui'] ) ) {
+			return true;
+		}
+		return false;
+	}
+
 	private function should_run_remediation(): bool {
+		// Skip remediation for editors view
+		if ( $this->is_builders_view() ) {
+			return false;
+		}
+
 		// Skip remediation during template_redirect AJAX requests
 		if ( $this->is_template_redirect_ajax_request() ) {
 			return false;