diff --git a/packages/frontend/editor-ui/src/components/NodeIcon.vue b/packages/frontend/editor-ui/src/components/NodeIcon.vue
index dfb399f5c1..4f6df5191e 100644
--- a/packages/frontend/editor-ui/src/components/NodeIcon.vue
+++ b/packages/frontend/editor-ui/src/components/NodeIcon.vue
@@ -62,7 +62,9 @@ const badge = computed(() => {
 	return iconSource.value.badge;
 });
 
-const nodeTypeName = computed(() => props.nodeName ?? props.nodeType?.displayName);
+const nodeTypeName = computed(() =>
+	props.nodeName && props.nodeName !== '' ? props.nodeName : props.nodeType?.displayName,
+);
 </script>
 
 <template>
diff --git a/packages/frontend/editor-ui/src/components/NodeTitle.vue b/packages/frontend/editor-ui/src/components/NodeTitle.vue
index 5e94f0fd48..4d31cc4674 100644
--- a/packages/frontend/editor-ui/src/components/NodeTitle.vue
+++ b/packages/frontend/editor-ui/src/components/NodeTitle.vue
@@ -34,7 +34,7 @@ const { width } = useElementSize(wrapperRef);
 <template>
 	<span :class="$style.container" data-test-id="node-title-container">
 		<span :class="$style.iconWrapper">
-			<NodeIcon :node-type="nodeType" :size="18" />
+			<NodeIcon :node-type="nodeType" :size="18" :show-tooltip="true" tooltip-position="left" />
 		</span>
 		<div ref="wrapperRef" :class="$style.textWrapper">
 			<N8nInlineTextEdit