diff --git a/packages/editor-ui/src/components/DataDisplay.vue b/packages/editor-ui/src/components/DataDisplay.vue
index 58b7bbcbfb..ac4e3bfab7 100644
--- a/packages/editor-ui/src/components/DataDisplay.vue
+++ b/packages/editor-ui/src/components/DataDisplay.vue
@@ -1,6 +1,6 @@
 <template>
 	<el-dialog
-		:visible="!!node"
+		:visible="!!node || renaming"
 		:before-close="close"
 		:show-close="false"
 		custom-class="data-display-wrapper"
@@ -48,6 +48,11 @@ export default mixins(externalHooks, nodeHelpers, workflowHelpers).extend({
 		NodeSettings,
 		RunData,
 	},
+	props: {
+		renaming: {
+			type: Boolean,
+		},
+	},
 	data () {
 		return {
 			settingsEventBus: new Vue(),
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index c082f544c3..859126cb27 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -370,7 +370,6 @@ export default mixins(
 					};
 					this.$emit('valueChanged', sendData);
 
-					this.$store.commit('setActiveNode', newValue);
 				} else if (parameterData.name.startsWith('parameters.')) {
 					// A node parameter changed
 
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index f30472ee79..867fd688e8 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -33,7 +33,7 @@
 				></node>
 			</div>
 		</div>
-		<DataDisplay @valueChanged="valueChanged"/>
+		<DataDisplay :renaming="renamingActive" @valueChanged="valueChanged"/>
 		<div v-if="!createNodeActive && !isReadOnly" class="node-creator-button" :title="$locale.baseText('nodeView.addNode')" @click="() => openNodeCreator('add_node_button')">
 			<n8n-icon-button size="xlarge" icon="plus" />
 		</div>
@@ -348,6 +348,7 @@ export default mixins(
 				pullConnActiveNodeName: null as string | null,
 				pullConnActive: false,
 				dropPrevented: false,
+				renamingActive: false,
 			};
 		},
 		beforeDestroy () {
@@ -2244,6 +2245,13 @@ export default mixins(
 				if (currentName === newName) {
 					return;
 				}
+
+				const activeNodeName = this.activeNode && this.activeNode.name;
+				const isActive = activeNodeName === currentName;
+				if (isActive) {
+					this.renamingActive = true;
+				}
+
 				// Check if node-name is unique else find one that is
 				newName = this.getUniqueNodeName({
 					originalName: newName,
@@ -2271,6 +2279,11 @@ export default mixins(
 				// Make sure that the node is selected again
 				this.deselectAllNodes();
 				this.nodeSelectedByName(newName);
+
+				if (isActive) {
+					this.$store.commit('setActiveNode', newName);
+					this.renamingActive = false;
+				}
 			},
 			deleteEveryEndpoint () {
 				// Check as it does not exist on first load