diff --git a/apps/desktop/src/components/v3/editor/MessageEditor.svelte b/apps/desktop/src/components/v3/editor/MessageEditor.svelte
index f1eaad83b4..5c6bd634da 100644
--- a/apps/desktop/src/components/v3/editor/MessageEditor.svelte
+++ b/apps/desktop/src/components/v3/editor/MessageEditor.svelte
@@ -19,6 +19,7 @@
 	} from '@gitbutler/ui/richText/plugins/FileUpload.svelte';
 	import Formatter from '@gitbutler/ui/richText/plugins/Formatter.svelte';
 	import GhostTextPlugin from '@gitbutler/ui/richText/plugins/GhostText.svelte';
+	import HardWrapPlugin from '@gitbutler/ui/richText/plugins/HardWrapPlugin.svelte';
 	import FormattingBar from '@gitbutler/ui/richText/tools/FormattingBar.svelte';
 	import FormattingButton from '@gitbutler/ui/richText/tools/FormattingButton.svelte';
 
@@ -295,6 +296,9 @@
 									onSelection={(text) => suggestionsHandler.onAcceptSuggestion(text)}
 								/>
 							{/if}
+							{#if wrapCountValue !== undefined}
+								<HardWrapPlugin maxLength={wrapCountValue} />
+							{/if}
 						{/snippet}
 					</RichTextEditor>
 				</div>
diff --git a/packages/ui/src/lib/RichTextEditor.svelte b/packages/ui/src/lib/RichTextEditor.svelte
index 9bcb55f9ab..7eb1b6a7dc 100644
--- a/packages/ui/src/lib/RichTextEditor.svelte
+++ b/packages/ui/src/lib/RichTextEditor.svelte
@@ -2,7 +2,6 @@
 	import { standardConfig } from '$lib/richText/config/config';
 	import { standardTheme } from '$lib/richText/config/theme';
 	import EmojiPlugin from '$lib/richText/plugins/Emoji.svelte';
-	import HardWrapPlugin from '$lib/richText/plugins/HardWrapPlugin.svelte';
 	import PlainTextIndentPlugin from '$lib/richText/plugins/PlainTextIndentPlugin.svelte';
 	import MarkdownTransitionPlugin from '$lib/richText/plugins/markdownTransition';
 	import OnChangePlugin, { type OnChangeCallback } from '$lib/richText/plugins/onChange.svelte';
@@ -235,7 +234,6 @@
 		{:else}
 			<PlainTextPlugin />
 			<PlainTextIndentPlugin />
-			<HardWrapPlugin maxLength={wrapCountValue} />
 		{/if}
 		<SharedHistoryPlugin />