diff --git a/src/components/input/editor/TipTap.vue b/src/components/input/editor/TipTap.vue
index 3dfe35415..4f802d8f9 100644
--- a/src/components/input/editor/TipTap.vue
+++ b/src/components/input/editor/TipTap.vue
@@ -319,16 +319,18 @@ const editor = useEditor({
 		Text,
 
 		Placeholder.configure({
-			placeholder: () => {
+			placeholder: ({editor}) => {
 				if (!isEditEnabled) {
 					return ''
 				}
 
-				if (placeholder !== '') {
-					return placeholder
+				if (editor.getText() !== '' && !editor.isFocused) {
+					return ''
 				}
 
-				return t('input.editor.placeholder')
+				return placeholder !== ''
+					? placeholder
+					: t('input.editor.placeholder')
 			},
 		}),
 		Typography,
@@ -499,16 +501,9 @@ function setFocusToEditor(event) {
 	&:focus-within, &:focus {
 		box-shadow: 0 0 0 2px hsla(var(--primary-hsl), 0.5);
 	}
-
-	&:focus-within, &:focus, &.tiptap__editor-is-empty {
-		.tiptap p.is-empty::before {
-			display: block;
-		}
-	}
 }
 
 .tiptap p.is-empty::before {
-	display: none;
 	content: attr(data-placeholder);
 	color: var(--grey-400);
 	pointer-events: none;