diff --git a/cypress/e2e/5-ndv.cy.ts b/cypress/e2e/5-ndv.cy.ts
index 956d6470f5607..7ff364a6b9c5e 100644
--- a/cypress/e2e/5-ndv.cy.ts
+++ b/cypress/e2e/5-ndv.cy.ts
@@ -42,7 +42,7 @@ describe('NDV', () => {
 		ndv.getters.outputDisplayMode().should('have.length.at.least', 1).and('be.visible');
 	});
 
-	it('should change input', () => {
+	it('should change input and go back to canvas', () => {
 		cy.createFixtureWorkflow('NDV-test-select-input.json', `NDV test select input ${uuid()}`);
 		workflowPage.actions.zoomToFit();
 		workflowPage.getters.canvasNodes().last().dblclick();
@@ -50,6 +50,9 @@ describe('NDV', () => {
 		ndv.getters.inputOption().last().click();
 		ndv.getters.inputDataContainer().find('[class*=schema_]').should('exist');
 		ndv.getters.inputDataContainer().should('contain', 'start');
+		ndv.getters.backToCanvas().click();
+		ndv.getters.container().should('not.be.visible');
+		cy.shouldNotHaveConsoleErrors();
 	});
 
 	it('should show correct validation state for resource locator params', () => {
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index c86db382a36e4..6046c23287f71 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -161,3 +161,10 @@ Cypress.Commands.add('draganddrop', (draggableSelector, droppableSelector) => {
 			}
 		});
 });
+
+Cypress.Commands.add('shouldNotHaveConsoleErrors', () => {
+	cy.window().then((win) => {
+		const spy = cy.spy(win.console, 'error');
+		cy.wrap(spy).should('not.have.been.called');
+	});
+});
diff --git a/cypress/support/index.ts b/cypress/support/index.ts
index 37140351ff62b..3390c14d82912 100644
--- a/cypress/support/index.ts
+++ b/cypress/support/index.ts
@@ -37,6 +37,7 @@ declare global {
 				options?: { abs?: boolean; index?: number; realMouse?: boolean },
 			): void;
 			draganddrop(draggableSelector: string, droppableSelector: string): void;
+			shouldNotHaveConsoleErrors(): void;
 		}
 	}
 }
diff --git a/packages/editor-ui/src/components/NodeDetailsView.vue b/packages/editor-ui/src/components/NodeDetailsView.vue
index 76a3e58b1b1a0..3eff69140fd69 100644
--- a/packages/editor-ui/src/components/NodeDetailsView.vue
+++ b/packages/editor-ui/src/components/NodeDetailsView.vue
@@ -344,7 +344,7 @@ export default defineComponent({
 			return Math.min(this.runOutputIndex, this.maxOutputRun);
 		},
 		maxInputRun(): number {
-			if (this.inputNode === null && this.activeNode === null) {
+			if (this.inputNode === null || this.activeNode === null) {
 				return 0;
 			}
 
@@ -355,7 +355,7 @@ export default defineComponent({
 
 			const runData: IRunData | null = this.workflowRunData;
 
-			if (outputs.filter((output) => output !== NodeConnectionType.Main).length) {
+			if (outputs.some((output) => output !== NodeConnectionType.Main)) {
 				node = this.activeNode;
 			}