diff --git a/CLAUDE_BPMN.md b/CLAUDE_BPMN.md
index a9b8e5bf5e4..52fa7a7c59d 100644
--- a/CLAUDE_BPMN.md
+++ b/CLAUDE_BPMN.md
@@ -62,22 +62,10 @@ d0968c65dd  Fix property-panel popup lock-up: $hide/$show + prefixEvent + displa
 - **Templates**
   - `…/editor-bpm/editor-app/configuration/properties/duedate-popup.html` — `bs-select` → `<select>`
   - `…/editor-bpm/views/popover/formfield-edit-popover.html` — `bs-tooltip` → native `title`
-- **Tests** *(all new on this branch)*
-  - `tests/.../BpmnEditorLoadsIT.java` — smoke (canvas + palette + Start Events + theme variable + `$modal`/`$popover` injector contract)
-  - `tests/.../BpmnEditorIT.java` — full edit / rename / save / "Published"
-  - `tests/.../BpmnEditorPropertyPopupIT.java` — open Execution Listeners modal, assert `$hide` + ✕-size + close-via-Cancel + canvas still interactive
+- **Tests** *(all new on this branch; later merged into one journey)*
+  - `tests/.../BpmnEditorIT.java` — ONE editor session asserting all three stations, in order: editor boot (canvas + palette + Start Events + theme variable + `$modal`/`$popover` injector contract), property-popup lifecycle (open Execution Listeners modal, assert `$hide` + ✕-size + close-via-Cancel + canvas still interactive), then full edit / rename / save / "Published". The original three classes (`BpmnEditorLoadsIT`, `BpmnEditorPropertyPopupIT`, `BpmnEditorIT`) each paid a full Dirigible boot + browser + ~30 s editor bring-up for the same freshly created `.bpmn` file, so they were consolidated.
   - `tests/.../BpmnModelApiIT.java` — API-level
 
-### Tests on this branch
-
-```
-BpmnEditorLoadsIT          25 s
-BpmnEditorIT               59 s
-BpmnEditorPropertyPopupIT  46 s
-```
-
-All three pass on `origin/fix-bpmn-editor`.
-
 ### Don't repeat these dead-ends
 
 - Don't add `.when('/editor/', { redirectTo: '/editor' })`. Angular 1.8 normalises trailing slashes and the route loops forever (`$rootScope:infdig`).
diff --git a/CLAUDE_UI.md b/CLAUDE_UI.md
index 9e20b4e69f8..84c637cb265 100644
--- a/CLAUDE_UI.md
+++ b/CLAUDE_UI.md
@@ -467,7 +467,7 @@ angular.module('myApp', ['ngRoute', 'blimpKit', /* … */]);
 
    Definitive source: `/webjars/blimpkit__blimpkit/dist/css/themes/blimpkit-light.css` (and `-dark.css`). Both files define the same names with theme-appropriate values, so `var(--foreground)` is correct for either theme.
 
-3. **A `--sap*` legacy variable** only when nothing above expresses the need. The shim still ships via `theme-blimpkit/css/sap-variables-{light,dark,auto}.css` for backwards compatibility (`BpmnEditorLoadsIT` asserts `--sapBackgroundColor` is non-empty inside the iframe), but most existing references are migration debt, not a pattern to copy. If you write `var(--sapXxx)`, leave a comment that explains which BlimpKit variable you tried first and why it didn't work.
+3. **A `--sap*` legacy variable** only when nothing above expresses the need. The shim still ships via `theme-blimpkit/css/sap-variables-{light,dark,auto}.css` for backwards compatibility (`BpmnEditorIT`'s boot station asserts the theme variable is non-empty inside the iframe), but most existing references are migration debt, not a pattern to copy. If you write `var(--sapXxx)`, leave a comment that explains which BlimpKit variable you tried first and why it didn't work.
 
 **Theme-detection class.** `@media (prefers-color-scheme: dark)` is the **OS preference**, not the Dirigible theme. To target the theme the user picked, write `setTheme()` to add `body.dirigible-theme-{light,dark,auto}` and gate your CSS on that class. Reserve `prefers-color-scheme` for the `dirigible-theme-auto` fallback.
 
diff --git a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/BpmnEditorIT.java b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/BpmnEditorIT.java
index b779c683233..734290ab7f8 100644
--- a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/BpmnEditorIT.java
+++ b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/BpmnEditorIT.java
@@ -12,42 +12,173 @@
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
 import org.eclipse.dirigible.tests.base.UserInterfaceIntegrationTest;
+import org.eclipse.dirigible.tests.framework.browser.HtmlAttribute;
+import org.eclipse.dirigible.tests.framework.browser.HtmlElementType;
 import org.eclipse.dirigible.tests.framework.ide.Workbench;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.By;
+
 import java.time.Duration;
 
+/**
+ * The complete BPMN visual modeler journey in ONE editor session: boot, property-panel popup
+ * lifecycle, and shape rename + save. These used to be three separate IT classes
+ * (BpmnEditorLoadsIT, BpmnEditorPropertyPopupIT, BpmnEditorIT), each paying its own Dirigible boot,
+ * browser and ~30s editor bring-up to look at the same freshly created {@code .bpmn} file - the
+ * three aspects are sequential stations of one user journey, so they are asserted in one pass.
+ *
+ * <p>
+ * Editor boot (former BpmnEditorLoadsIT): the Oryx-based editor loads without errors - the editor
+ * tab is present, the canvas and stencil palette render (proving {@code GET
+ * /services/bpm/stencil-sets} returned data and AngularJS processed it), the theme CSS variables
+ * resolve inside the editor iframe, and the $modal/$popover + Bootstrap-3 jQuery plugin stack that
+ * replaced angular-strap after the Angular 1.8.2 migration is complete. Guards against regressions
+ * where missing Angular module dependencies silently prevent the editor from bootstrapping.
+ *
+ * <p>
+ * Property-panel popup lifecycle (former BpmnEditorPropertyPopupIT): the wide property popups
+ * (execution listeners et al.) open as a BlimpKit {@code <bk-dialog>}
+ * ({@code section.fd-dialog--active}), the modal scope exposes the angular-strap-compatible
+ * {@code $hide()}, the header close button is a real interactable target, Cancel dismisses the
+ * dialog, and the canvas stays interactive afterwards. If {@code modal-service.js} misses any of
+ * that, the popup can never be closed - the dialog stays open and the editor grays out.
+ *
+ * <p>
+ * Rename + save (former BpmnEditorIT body): inline rename via double-click on the shape, rename via
+ * the property panel, then save through the Flowable toolbar action - asserting the status-bar
+ * "saved" message and the final "Published" message propagate across frames.
+ */
 public class BpmnEditorIT extends UserInterfaceIntegrationTest {
 
     private static final String PROJECT = "BpmnEditorIT";
     private static final String BPMN_FILE = "bpmn-new.bpmn";
 
     @Test
-    void bpmnEditor_select_rename_and_save() {
+    void bpmnEditor_boots_popups_close_and_rename_save_publishes() {
         Workbench workbench = ide.openWorkbench();
         workbench.createNewProject(PROJECT);
         workbench.createFileInProject(PROJECT, "Business Process Model");
         workbench.openFile(BPMN_FILE);
 
+        assertEditorBoots();
+        assertPropertyPopupOpensAndCloses();
+        assertRenameAndSavePublishes();
+    }
+
+    private void assertEditorBoots() {
+        browser.assertElementExistByAttributePatternAndText(HtmlElementType.SPAN, HtmlAttribute.CLASS, "fd-icon-tab-bar__tag", BPMN_FILE);
+
         // Editor loads: canvas and stencil palette are visible
         browser.findElementInAllFrames(By.id("canvasSection"), Condition.visible);
         browser.findElementInAllFrames(By.id("paletteSection"), Condition.visible);
 
-        // Expand "Activities" group and verify UserTask is initialized as draggable
-        Selenide.$(By.xpath("//span[contains(.,'Activities')]"))
+        // Expand "Start Events" group and verify StartNoneEvent item appears
+        Selenide.$(By.xpath("//span[contains(.,'Start Events')]"))
                 .click();
-        Selenide.$(By.id("UserTask"))
-                .shouldBe(Condition.visible, Duration.ofSeconds(5))
-                .shouldHave(Condition.cssClass("ui-draggable"));
+        browser.findElementInAllFrames(By.id("StartNoneEvent"), Condition.visible);
+
+        // The BPM editor's editor-app/theme/*.css references CSS variables that come from the
+        // active theme's *-{auto,light,dark}.css file. Assert the variable resolves to a non-empty
+        // value so we catch any regression where the theme stops shipping the legacy variables.
+        Selenide.$(By.id("canvasSection"))
+                .shouldBe(Condition.visible);
+        Object sapBgColor =
+                Selenide.executeJavaScript("return getComputedStyle(document.documentElement).getPropertyValue('--background').trim();");
+        Assertions.assertTrue(sapBgColor != null && !sapBgColor.toString()
+                                                               .isEmpty(),
+                "--background is undefined inside the BPM editor iframe — theme variables not applied.");
+
+        // angular-strap was removed during the Angular 1.4.7 -> 1.8.2 migration. Its $modal and
+        // $popover services are now provided by scripts/services/{modal,popover}-service.js (each
+        // delegating to Bootstrap-3's jQuery .modal/.popover plugin). The property-panel popups —
+        // execution-listeners, task-listeners, event-listeners; each opens a modal containing a
+        // "Delegate Expression" input — depend on this whole chain. Verify both factories are in
+        // the injector AND the underlying Bootstrap-3 jQuery plugins are present, so an accidental
+        // drop of any of the four script tags is caught here.
+        Object stackOk = Selenide.executeJavaScript("var inj = angular.element(document.body).injector();"
+                + "return inj.has('$modal') && typeof inj.get('$modal') === 'function'"
+                + "    && inj.has('$popover') && typeof inj.get('$popover') === 'function'" + "    && typeof jQuery.fn.modal === 'function'"
+                + "    && typeof jQuery.fn.popover === 'function';");
+        Assertions.assertTrue(Boolean.TRUE.equals(stackOk),
+                "Modal/popover stack incomplete — $modal/$popover factories or Bootstrap-3 jQuery plugins missing inside the BPM editor iframe.");
+    }
 
-        // Click on the existing service task shape (from the BPMN template) to select it
+    private void assertPropertyPopupOpensAndCloses() {
+        // Select the service task that ships in the template — selecting populates the property panel.
         Selenide.$(By.id("svg-my-service-task"))
                 .click();
         Selenide.$(By.cssSelector("#propertySection .property-row"))
                 .shouldBe(Condition.visible, Duration.ofSeconds(10));
 
-        // Inline rename via double-click on the shape
+        // The "Execution listeners" property row is one of the wide popups (it lives inside
+        // editor-app/configuration/properties/execution-listeners-popup.html, opened by
+        // FlowableExecutionListenersCtrl via _internalCreateModal($modal, …)). Clicking its title
+        // switches the row to write mode and immediately opens the dialog.
+        Selenide.$(By.xpath(
+                "//*[@id='propertySection']//span[contains(@class,'title') and contains(normalize-space(.),'Execution listeners')]"))
+                .click();
+
+        // Dialog appeared: BlimpKit's bk-dialog renders <section class="fd-dialog"> and adds
+        // .fd-dialog--active while it's visible.
+        Selenide.$(By.cssSelector("section.fd-dialog.fd-dialog--active"))
+                .shouldBe(Condition.visible, Duration.ofSeconds(5));
+
+        // Modal scope must expose $hide() — without it the close()/cancel() handlers in
+        // properties-execution-listeners-controller.js (both call $scope.$hide()) silently throw
+        // and the dialog can never be dismissed. The dialog itself has an isolate scope (bk-dialog
+        // directive); the controller's scope sits on a child element with ng-controller, so we
+        // look up scope via the close button which is inside the controller's subtree.
+        Boolean hideExists = Selenide.executeJavaScript("var btn = document.querySelector("
+                + "  'section.fd-dialog.fd-dialog--active .fd-dialog__header button.fd-button');" + "if (!btn) return false;"
+                + "var scope = angular.element(btn).scope();" + "while (scope && typeof scope.$hide !== 'function') scope = scope.$parent;"
+                + "return scope && typeof scope.$hide === 'function';");
+        Assertions.assertTrue(Boolean.TRUE.equals(hideExists),
+                "modal scope.$hide is missing — angular-strap-compatible $hide() helper was not added by modal-service.js.");
+
+        // The header ✕ button must be a real, non-zero-sized, interactable target. <bk-button>
+        // renders the icon as a child <i class="sap-icon sap-icon--decline">; the button itself
+        // is a native <button class="fd-button …"> carrying the click handler.
+        Object closeBtnSize = Selenide.executeJavaScript("var b = document.querySelector("
+                + "  'section.fd-dialog.fd-dialog--active .fd-dialog__header button.fd-button');" + "if (!b) return null;"
+                + "var r = b.getBoundingClientRect();" + "return JSON.stringify({ w: Math.round(r.width), h: Math.round(r.height) });");
+        Assertions.assertNotNull(closeBtnSize, "dialog header close (×) button is missing from the DOM.");
+        Assertions.assertFalse(closeBtnSize.toString()
+                                           .contains("\"w\":0")
+                || closeBtnSize.toString()
+                               .contains("\"h\":0"),
+                "dialog header close (×) button has zero size: " + closeBtnSize);
+
+        // Dismiss the dialog via the Cancel button in the footer — same path the user takes.
+        // bk-button[label="Cancel"] compiles to a <button class="fd-button ...">Cancel</button>
+        // wrapped in <div class="fd-bar__element">.
+        Selenide.$(By.xpath("//section[contains(@class,'fd-dialog--active')]" + "//footer//button[normalize-space(.)='Cancel']"))
+                .shouldBe(Condition.visible, Duration.ofSeconds(5))
+                .click();
+
+        // Dialog must be gone: no active fd-dialog left in the DOM. modal-service removes the
+        // compiled element ~300ms after flipping `modal.visible` to false so the fd-dialog--active
+        // class is gone first, then the element itself unmounts.
+        Selenide.$(By.cssSelector("section.fd-dialog.fd-dialog--active"))
+                .shouldNotBe(Condition.visible, Duration.ofSeconds(5));
+
+        // Canvas is interactive again: re-clicking the service task should re-populate the property
+        // panel (proves the iframe still accepts pointer events).
+        Selenide.$(By.id("svg-my-service-task"))
+                .click();
+        Selenide.$(By.cssSelector("#propertySection .property-row"))
+                .shouldBe(Condition.visible, Duration.ofSeconds(5));
+    }
+
+    private void assertRenameAndSavePublishes() {
+        // Expand "Activities" group and verify UserTask is initialized as draggable
+        Selenide.$(By.xpath("//span[contains(.,'Activities')]"))
+                .click();
+        Selenide.$(By.id("UserTask"))
+                .shouldBe(Condition.visible, Duration.ofSeconds(5))
+                .shouldHave(Condition.cssClass("ui-draggable"));
+
+        // Inline rename via double-click on the shape (already selected by the popup station)
         Selenide.$(By.id("svg-my-service-task"))
                 .doubleClick();
         Selenide.$(By.id("shapeTextInput"))
diff --git a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/BpmnEditorLoadsIT.java b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/BpmnEditorLoadsIT.java
deleted file mode 100644
index 6b6ac42b443..00000000000
--- a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/BpmnEditorLoadsIT.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2010-2026 Eclipse Dirigible contributors
- *
- * All rights reserved. This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-FileCopyrightText: Eclipse Dirigible contributors SPDX-License-Identifier: EPL-2.0
- */
-package org.eclipse.dirigible.integration.tests.ui.tests;
-
-import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.Selenide;
-import org.eclipse.dirigible.tests.base.UserInterfaceIntegrationTest;
-import org.eclipse.dirigible.tests.framework.browser.HtmlAttribute;
-import org.eclipse.dirigible.tests.framework.browser.HtmlElementType;
-import org.eclipse.dirigible.tests.framework.ide.Workbench;
-import org.junit.jupiter.api.Test;
-import org.openqa.selenium.By;
-
-/**
- * Smoke test for the BPMN visual modeler UI.
- *
- * <p>
- * Creates a new {@code .bpmn} file via the IDE Workbench's "New File" wizard, opens it, and
- * verifies that the Oryx-based BPMN editor loads without errors — specifically:
- * <ul>
- * <li>The editor tab is present in the IDE tab bar.</li>
- * <li>The canvas section (where Oryx renders the diagram) is visible inside the editor iframe.</li>
- * <li>At least one stencil item (Start event) is rendered in the palette — confirming that the
- * {@code GET /services/bpm/stencil-sets} API returned data and AngularJS processed it.</li>
- * </ul>
- *
- * <p>
- * This guards against regressions introduced by the {@code bpmn-editor-modernization} branch where
- * missing Angular module dependencies silently prevent the editor from bootstrapping.
- */
-public class BpmnEditorLoadsIT extends UserInterfaceIntegrationTest {
-
-    private static final String PROJECT_NAME = "BpmnEditorLoadsIT";
-    private static final String BPMN_FILE_NAME = "bpmn-new.bpmn";
-
-    @Test
-    void bpmnEditor_opens_and_canvas_with_stencil_palette_renders() {
-        Workbench workbench = ide.openWorkbench();
-        workbench.createNewProject(PROJECT_NAME);
-        workbench.createFileInProject(PROJECT_NAME, "Business Process Model");
-        workbench.openFile(BPMN_FILE_NAME);
-
-        browser.assertElementExistByAttributePatternAndText(HtmlElementType.SPAN, HtmlAttribute.CLASS, "fd-icon-tab-bar__tag",
-                BPMN_FILE_NAME);
-
-        browser.findElementInAllFrames(By.id("canvasSection"), Condition.visible);
-
-        // Stencil palette renders
-        browser.findElementInAllFrames(By.id("paletteSection"), Condition.visible);
-
-        // Expand "Start Events" group and verify StartNoneEvent item appears
-        Selenide.$(By.xpath("//span[contains(.,'Start Events')]"))
-                .click();
-        browser.findElementInAllFrames(By.id("StartNoneEvent"), Condition.visible);
-
-        // The BPM editor's editor-app/theme/*.css references CSS variables that come from the
-        // active theme's *-{auto,light,dark}.css file. Assert the variable resolves to a non-empty
-        // value so we catch any regression where the theme stops shipping the legacy variables.
-        Selenide.$(By.id("canvasSection"))
-                .shouldBe(Condition.visible);
-        Object sapBgColor =
-                Selenide.executeJavaScript("return getComputedStyle(document.documentElement).getPropertyValue('--background').trim();");
-        org.junit.jupiter.api.Assertions.assertTrue(sapBgColor != null && !sapBgColor.toString()
-                                                                                     .isEmpty(),
-                "--background is undefined inside the BPM editor iframe — theme variables not applied.");
-
-        // angular-strap was removed during the Angular 1.4.7 -> 1.8.2 migration. Its $modal and
-        // $popover services are now provided by scripts/services/{modal,popover}-service.js (each
-        // delegating to Bootstrap-3's jQuery .modal/.popover plugin). The property-panel popups —
-        // execution-listeners, task-listeners, event-listeners; each opens a modal containing a
-        // "Delegate Expression" input — depend on this whole chain. Verify both factories are in
-        // the injector AND the underlying Bootstrap-3 jQuery plugins are present, so an accidental
-        // drop of any of the four script tags is caught here.
-        Object stackOk = Selenide.executeJavaScript("var inj = angular.element(document.body).injector();"
-                + "return inj.has('$modal') && typeof inj.get('$modal') === 'function'"
-                + "    && inj.has('$popover') && typeof inj.get('$popover') === 'function'" + "    && typeof jQuery.fn.modal === 'function'"
-                + "    && typeof jQuery.fn.popover === 'function';");
-        org.junit.jupiter.api.Assertions.assertTrue(Boolean.TRUE.equals(stackOk),
-                "Modal/popover stack incomplete — $modal/$popover factories or Bootstrap-3 jQuery plugins missing inside the BPM editor iframe.");
-    }
-}
diff --git a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/BpmnEditorPropertyPopupIT.java b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/BpmnEditorPropertyPopupIT.java
deleted file mode 100644
index e8d55621ca4..00000000000
--- a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/BpmnEditorPropertyPopupIT.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2010-2026 Eclipse Dirigible contributors
- *
- * All rights reserved. This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-FileCopyrightText: Eclipse Dirigible contributors SPDX-License-Identifier: EPL-2.0
- */
-package org.eclipse.dirigible.integration.tests.ui.tests;
-
-import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.Selenide;
-import org.eclipse.dirigible.tests.base.UserInterfaceIntegrationTest;
-import org.eclipse.dirigible.tests.framework.ide.Workbench;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.openqa.selenium.By;
-
-import java.time.Duration;
-
-/**
- * Verifies the property-panel popup lifecycle inside the BPMN editor.
- *
- * <p>
- * When the user selects a shape and clicks one of the property rows that opens a modal — Class,
- * Expression, Delegate expression, Class fields, Execution listeners, ... — the popup's close
- * handler ultimately calls {@code $scope.$hide()} on the modal scope. After the Angular 1.4.7 →
- * 1.8.2 migration angular-strap was removed, so {@code $modal} is now provided by
- * {@code scripts/services/modal-service.js}; that drop-in MUST add {@code $hide()/$show()} to the
- * modal scope, emit {@code modal.show.before/show/hide.before/hide} events up the scope tree, and
- * honour the {@code prefixEvent} option. If any of those is missing the popup can no longer be
- * closed — the dialog stays open, the editor grays out, and the canvas becomes unclickable.
- *
- * <p>
- * The {@code execution-listeners-popup.html} template was migrated to BlimpKit's
- * {@code <bk-dialog>} as part of the BlimpKit visual alignment, so the expected DOM is now
- * {@code section.fd-dialog.fd-dialog--active} (Fundamental Styles) rather than Bootstrap-3's
- * {@code div.modal.in}. The close ✕ in the header is a
- * {@code <bk-button glyph="sap-icon--decline">}, rendered as a {@code <button>} carrying
- * {@code .sap-icon--decline}.
- */
-public class BpmnEditorPropertyPopupIT extends UserInterfaceIntegrationTest {
-
-    private static final String PROJECT_NAME = "BpmnEditorPropertyPopupIT";
-    private static final String BPMN_FILE_NAME = "bpmn-new.bpmn";
-
-    @Test
-    void executionListenersPopup_opens_and_closes_without_locking_the_editor() {
-        Workbench workbench = ide.openWorkbench();
-        workbench.createNewProject(PROJECT_NAME);
-        workbench.createFileInProject(PROJECT_NAME, "Business Process Model");
-        workbench.openFile(BPMN_FILE_NAME);
-
-        // Wait for the BPM editor iframe to load + canvas to render.
-        browser.findElementInAllFrames(By.id("canvasSection"), Condition.visible);
-        browser.findElementInAllFrames(By.id("paletteSection"), Condition.visible);
-
-        // Select the service task that ships in the template — selecting populates the property panel.
-        Selenide.$(By.id("svg-my-service-task"))
-                .click();
-        Selenide.$(By.cssSelector("#propertySection .property-row"))
-                .shouldBe(Condition.visible, Duration.ofSeconds(10));
-
-        // The "Execution listeners" property row is one of the wide popups (it lives inside
-        // editor-app/configuration/properties/execution-listeners-popup.html, opened by
-        // FlowableExecutionListenersCtrl via _internalCreateModal($modal, …)). Clicking its title
-        // switches the row to write mode and immediately opens the dialog.
-        Selenide.$(By.xpath(
-                "//*[@id='propertySection']//span[contains(@class,'title') and contains(normalize-space(.),'Execution listeners')]"))
-                .click();
-
-        // Dialog appeared: BlimpKit's bk-dialog renders <section class="fd-dialog"> and adds
-        // .fd-dialog--active while it's visible.
-        Selenide.$(By.cssSelector("section.fd-dialog.fd-dialog--active"))
-                .shouldBe(Condition.visible, Duration.ofSeconds(5));
-
-        // Modal scope must expose $hide() — without it the close()/cancel() handlers in
-        // properties-execution-listeners-controller.js (both call $scope.$hide()) silently throw
-        // and the dialog can never be dismissed. The dialog itself has an isolate scope (bk-dialog
-        // directive); the controller's scope sits on a child element with ng-controller, so we
-        // look up scope via the close button which is inside the controller's subtree.
-        Boolean hideExists = Selenide.executeJavaScript("var btn = document.querySelector("
-                + "  'section.fd-dialog.fd-dialog--active .fd-dialog__header button.fd-button');" + "if (!btn) return false;"
-                + "var scope = angular.element(btn).scope();" + "while (scope && typeof scope.$hide !== 'function') scope = scope.$parent;"
-                + "return scope && typeof scope.$hide === 'function';");
-        Assertions.assertTrue(Boolean.TRUE.equals(hideExists),
-                "modal scope.$hide is missing — angular-strap-compatible $hide() helper was not added by modal-service.js.");
-
-        // The header ✕ button must be a real, non-zero-sized, interactable target. <bk-button>
-        // renders the icon as a child <i class="sap-icon sap-icon--decline">; the button itself
-        // is a native <button class="fd-button …"> carrying the click handler.
-        Object closeBtnSize = Selenide.executeJavaScript("var b = document.querySelector("
-                + "  'section.fd-dialog.fd-dialog--active .fd-dialog__header button.fd-button');" + "if (!b) return null;"
-                + "var r = b.getBoundingClientRect();" + "return JSON.stringify({ w: Math.round(r.width), h: Math.round(r.height) });");
-        Assertions.assertNotNull(closeBtnSize, "dialog header close (×) button is missing from the DOM.");
-        Assertions.assertFalse(closeBtnSize.toString()
-                                           .contains("\"w\":0")
-                || closeBtnSize.toString()
-                               .contains("\"h\":0"),
-                "dialog header close (×) button has zero size: " + closeBtnSize);
-
-        // Dismiss the dialog via the Cancel button in the footer — same path the user takes.
-        // bk-button[label="Cancel"] compiles to a <button class="fd-button ...">Cancel</button>
-        // wrapped in <div class="fd-bar__element">.
-        Selenide.$(By.xpath("//section[contains(@class,'fd-dialog--active')]" + "//footer//button[normalize-space(.)='Cancel']"))
-                .shouldBe(Condition.visible, Duration.ofSeconds(5))
-                .click();
-
-        // Dialog must be gone: no active fd-dialog left in the DOM. modal-service removes the
-        // compiled element ~300ms after flipping `modal.visible` to false so the fd-dialog--active
-        // class is gone first, then the element itself unmounts.
-        Selenide.$(By.cssSelector("section.fd-dialog.fd-dialog--active"))
-                .shouldNotBe(Condition.visible, Duration.ofSeconds(5));
-
-        // Canvas is interactive again: re-clicking the service task should re-populate the property
-        // panel (proves the iframe still accepts pointer events).
-        Selenide.$(By.id("svg-my-service-task"))
-                .click();
-        Selenide.$(By.cssSelector("#propertySection .property-row"))
-                .shouldBe(Condition.visible, Duration.ofSeconds(5));
-    }
-}
diff --git a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/CreateNewFileIT.java b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/CreateNewFileIT.java
index 52cc1ae409f..082f4d34106 100644
--- a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/CreateNewFileIT.java
+++ b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/CreateNewFileIT.java
@@ -9,14 +9,18 @@
  */
 package org.eclipse.dirigible.integration.tests.ui.tests;
 
-import org.junit.jupiter.api.Tag;
 import org.eclipse.dirigible.tests.base.UserInterfaceIntegrationTest;
 import org.eclipse.dirigible.tests.framework.browser.HtmlAttribute;
 import org.eclipse.dirigible.tests.framework.browser.HtmlElementType;
 import org.eclipse.dirigible.tests.framework.ide.Workbench;
 import org.junit.jupiter.api.Test;
 
-@Tag("smoke")
+/**
+ * The FULL new-file sweep: every {@link NewFileOption} creates its file and opens its editor. At
+ * ~20 editors x (create dialog + editor bring-up) this is the single longest IT, so it runs in the
+ * nightly/master {@code ui} shard only; the per-PR smoke gate runs {@link CreateNewFileSmokeIT},
+ * which covers one representative option per heavyweight editor family.
+ */
 public class CreateNewFileIT extends UserInterfaceIntegrationTest {
 
     @Test
diff --git a/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/CreateNewFileSmokeIT.java b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/CreateNewFileSmokeIT.java
new file mode 100644
index 00000000000..8762e673adb
--- /dev/null
+++ b/tests/tests-integrations/src/main/java/org/eclipse/dirigible/integration/tests/ui/tests/CreateNewFileSmokeIT.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2010-2026 Eclipse Dirigible contributors
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: Eclipse Dirigible contributors SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.dirigible.integration.tests.ui.tests;
+
+import org.eclipse.dirigible.tests.base.UserInterfaceIntegrationTest;
+import org.eclipse.dirigible.tests.framework.browser.HtmlAttribute;
+import org.eclipse.dirigible.tests.framework.browser.HtmlElementType;
+import org.eclipse.dirigible.tests.framework.ide.Workbench;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+/**
+ * The per-PR slice of the new-file journey: one representative {@link NewFileOption} per
+ * heavyweight editor family - Monaco (TypeScript service), the BPMN modeler, the EDM modeler and
+ * the form builder - so a PR that breaks the create-file dialog or an editor bootstrap fails fast.
+ * The exhaustive sweep over every option stays in {@link CreateNewFileIT}, which runs in the
+ * nightly/master {@code ui} shard; keep this list short, the smoke gate pays for it on every PR.
+ */
+@Tag("smoke")
+public class CreateNewFileSmokeIT extends UserInterfaceIntegrationTest {
+
+    private static final List<NewFileOption> REPRESENTATIVE_OPTIONS = List.of(NewFileOption.TYPESCRIPT_SERVICE,
+            NewFileOption.BUSINESS_PROCESS_MODEL, NewFileOption.ENTITY_DATA_MODEL, NewFileOption.FORM_DEFINITION);
+
+    @Test
+    void test() {
+        Workbench workbench = ide.openWorkbench();
+        workbench.createNewProject(this.getClass()
+                                       .getSimpleName());
+
+        for (NewFileOption newFileOption : REPRESENTATIVE_OPTIONS) {
+            workbench.createFileInProject(this.getClass()
+                                              .getSimpleName(),
+                    newFileOption.getOptionName());
+
+            workbench.openFile(newFileOption.getNewFileName());
+
+            assertFileTabIsOpen(newFileOption);
+        }
+    }
+
+    private void assertFileTabIsOpen(NewFileOption newFileOption) {
+        browser.assertElementExistByAttributePatternAndText(HtmlElementType.SPAN, HtmlAttribute.CLASS, "fd-icon-tab-bar__tag",
+                newFileOption.getNewFileName());
+    }
+
+}