diff --git a/packages/frontend/editor-ui/src/components/ParameterOptions.vue b/packages/frontend/editor-ui/src/components/ParameterOptions.vue
index 69ba7cca50..d2999b2bd4 100644
--- a/packages/frontend/editor-ui/src/components/ParameterOptions.vue
+++ b/packages/frontend/editor-ui/src/components/ParameterOptions.vue
@@ -55,7 +55,7 @@ const shouldShowExpressionSelector = computed(
 const isFocusPanelFeatureEnabled = computed(() => {
 	return posthogStore.getVariant(FOCUS_PANEL_EXPERIMENT.name) === FOCUS_PANEL_EXPERIMENT.variant;
 });
-const hasFocusAction = computed(
+const canBeOpenedInFocusPanel = computed(
 	() =>
 		isFocusPanelFeatureEnabled.value &&
 		!props.parameter.isNodeSetting &&
@@ -73,10 +73,6 @@ const shouldShowOptions = computed(() => {
 		return false;
 	}
 
-	if (hasFocusAction.value) {
-		return true;
-	}
-
 	if (['codeNodeEditor', 'sqlEditor'].includes(props.parameter.typeOptions?.editor ?? '')) {
 		return false;
 	}
@@ -105,19 +101,13 @@ const actions = computed(() => {
 		return props.customActions;
 	}
 
-	const focusAction = {
-		label: i18n.baseText('parameterInput.focusParameter'),
-		value: 'focus',
-		disabled: false,
-	};
-
 	if (isHtmlEditor.value && !isValueAnExpression.value) {
-		const formatHtmlAction = {
-			label: i18n.baseText('parameterInput.formatHtml'),
-			value: 'formatHtml',
-		};
-
-		return hasFocusAction.value ? [formatHtmlAction, focusAction] : [formatHtmlAction];
+		return [
+			{
+				label: i18n.baseText('parameterInput.formatHtml'),
+				value: 'formatHtml',
+			},
+		];
 	}
 
 	const resetAction = {
@@ -131,11 +121,7 @@ const actions = computed(() => {
 		props.parameter.typeOptions?.editor ?? '',
 	);
 
-	// Conditionally build actions array without nulls to ensure correct typing
-	const parameterActions = [
-		hasResetAction ? [resetAction] : [],
-		hasFocusAction.value ? [focusAction] : [],
-	].flat();
+	const parameterActions = [hasResetAction ? resetAction : []].flat();
 
 	if (
 		hasRemoteMethod.value ||
@@ -176,6 +162,15 @@ const onViewSelected = (selected: string) => {
 			</n8n-text>
 		</div>
 		<div v-else :class="$style.controlsContainer">
+			<N8nTooltip v-if="canBeOpenedInFocusPanel">
+				<template #content>{{ i18n.baseText('parameterInput.focusParameter') }}</template>
+				<N8nIcon
+					size="medium"
+					:icon="'panel-right'"
+					:class="$style.focusButton"
+					@click="$emit('update:modelValue', 'focus')"
+				/>
+			</N8nTooltip>
 			<div
 				:class="{
 					[$style.noExpressionSelector]: !shouldShowExpressionSelector,
@@ -209,9 +204,12 @@ const onViewSelected = (selected: string) => {
 </template>
 
 <style lang="scss" module>
+$container-height: 22px;
+
 .container {
 	display: flex;
-	min-height: 22px;
+	min-height: $container-height;
+	max-height: $container-height;
 }
 
 .loader {
@@ -234,4 +232,11 @@ const onViewSelected = (selected: string) => {
 		padding-right: 0 !important;
 	}
 }
+
+.focusButton {
+	&:hover {
+		cursor: pointer;
+		color: var(--color-primary);
+	}
+}
 </style>