diff --git a/components/ui/editor-intent/src/main/resources/META-INF/dirigible/editor-intent/editor.html b/components/ui/editor-intent/src/main/resources/META-INF/dirigible/editor-intent/editor.html
index 576a3b5881d..900a9e77905 100644
--- a/components/ui/editor-intent/src/main/resources/META-INF/dirigible/editor-intent/editor.html
+++ b/components/ui/editor-intent/src/main/resources/META-INF/dirigible/editor-intent/editor.html
@@ -158,7 +158,7 @@
             <bk-toolbar-separator></bk-toolbar-separator>
             <bk-button state="transparent" glyph="sap-icon--save" title="Save" aria-label="Save" ng-click="save()" ng-disabled="!changed || state.isBusy"></bk-button>
             <bk-toolbar-separator></bk-toolbar-separator>
-            <bk-button state="emphasized" glyph="sap-icon--generate-shortcut" label="Generate" title="Generate the model files into the project" aria-label="Generate" ng-click="generate()" ng-disabled="state.isBusy || issues.length"></bk-button>
+            <bk-button state="emphasized" glyph="sap-icon--generate-shortcut" label="Generate" title="Generate the model files into the project" aria-label="Generate" ng-click="generate()" ng-disabled="state.isBusy"></bk-button>
             <bk-toolbar-separator></bk-toolbar-separator>
             <bk-button state="{{chat.open ? 'emphasized' : 'transparent'}}" glyph="sap-icon--discussion" title="AI assistant" aria-label="AI assistant" ng-click="toggleChat()"></bk-button>
         </bk-toolbar>
diff --git a/components/ui/editor-intent/src/main/resources/META-INF/dirigible/editor-intent/js/editor.js b/components/ui/editor-intent/src/main/resources/META-INF/dirigible/editor-intent/js/editor.js
index 099303f936d..81a4a3b9aec 100644
--- a/components/ui/editor-intent/src/main/resources/META-INF/dirigible/editor-intent/js/editor.js
+++ b/components/ui/editor-intent/src/main/resources/META-INF/dirigible/editor-intent/js/editor.js
@@ -248,9 +248,9 @@ editorView.controller('IntentEditorController', ($scope, $http, ViewParameters,
 
     // Re-parse and re-validate the current buffer on demand. Generate resolves cross-model
     // dependencies against other projects' already-generated .model files; when one is missing it
-    // fails with issues that stay pinned (blocking Generate) until the buffer is re-parsed. After
-    // generating the dependency project, Refresh clears those stale issues and re-renders — no browser
-    // reload needed.
+    // fails with issues that stay pinned in the strip until the buffer is re-parsed (Generate itself
+    // stays clickable — it re-validates server-side). After generating the dependency project,
+    // Refresh clears those stale issues and re-renders — no browser reload needed.
     $scope.refresh = () => {
         refreshPreview().then(() => {
             statusBarHub.showMessage('Re-validated the intent');
@@ -319,6 +319,7 @@ editorView.controller('IntentEditorController', ($scope, $http, ViewParameters,
         dialogHub.showBusyDialog('Generating model files');
         $http.post(`${GENERATE_URL}?workspace=${encodeURIComponent(location.workspace)}&project=${encodeURIComponent(location.project)}&path=${encodeURIComponent(location.path)}`)
              .then((response) => {
+                 $scope.issues = []; // a successful generate clears any pinned cross-model issue from a prior attempt
                  const written = (response.data.written || []).length;
                  const scrubbed = (response.data.scrubbed || []).length;
                  const plan = response.data.codeGenerations || [];