diff --git a/.changeset/option-always-inline-editor.md b/.changeset/option-always-inline-editor.md
new file mode 100644
index 000000000..cf0304d86
--- /dev/null
+++ b/.changeset/option-always-inline-editor.md
@@ -0,0 +1,5 @@
+---
+default: patch
+---
+
+Add option to always keep the last line of the text editor "inline" with the UI buttons.
diff --git a/src/app/components/editor/Editor.css.ts b/src/app/components/editor/Editor.css.ts
index 077519d17..806cdce02 100644
--- a/src/app/components/editor/Editor.css.ts
+++ b/src/app/components/editor/Editor.css.ts
@@ -15,7 +15,7 @@ export const Editor = style([
 
 export const EditorRow = style({
   gridTemplateColumns: 'auto 1fr auto',
-  alignItems: 'center',
+  alignItems: 'end',
 });
 
 export const EditorRowMultiline = style({
@@ -80,6 +80,10 @@ export const EditorTextarea = style([
   },
 ]);
 
+export const EditorTextareaInline = style({
+  paddingBottom: toRem(13),
+});
+
 export const EditorResponsiveAfterMultiline = style([
   EditorOptions,
   {
diff --git a/src/app/components/editor/Editor.tsx b/src/app/components/editor/Editor.tsx
index ab6e7f3ff..f7c907b63 100644
--- a/src/app/components/editor/Editor.tsx
+++ b/src/app/components/editor/Editor.tsx
@@ -132,7 +132,8 @@ export const CustomEditor = forwardRef<HTMLDivElement, CustomEditorProps>(
     const hasBefore = Boolean(before);
     const hasAfter = Boolean(after);
     const hasResponsiveAfter = Boolean(responsiveAfter);
-    const layoutIsMultiline = isMultiline || forceMultilineLayout;
+    const [alwaysInlineEditor] = useSetting(settingsAtom, 'alwaysInlineEditor');
+    const layoutIsMultiline = !alwaysInlineEditor && (isMultiline || forceMultilineLayout);
     const showResponsiveAfterInFooter = hasResponsiveAfter && layoutIsMultiline;
     const showResponsiveAfterInline = hasResponsiveAfter && !showResponsiveAfterInFooter;
 
@@ -449,7 +450,7 @@ export const CustomEditor = forwardRef<HTMLDivElement, CustomEditorProps>(
               <Editable
                 ref={editableRef}
                 data-editable-name={editableName}
-                className={css.EditorTextarea}
+                className={`${css.EditorTextarea} ${alwaysInlineEditor ? css.EditorTextareaInline : ''}`}
                 placeholder={placeholder}
                 renderPlaceholder={renderPlaceholder}
                 renderElement={renderElement}
diff --git a/src/app/features/settings/general/General.tsx b/src/app/features/settings/general/General.tsx
index b9b32ab85..11b75507c 100644
--- a/src/app/features/settings/general/General.tsx
+++ b/src/app/features/settings/general/General.tsx
@@ -421,6 +421,10 @@ function DateAndTime() {
 function Editor({ isMobile }: Readonly<{ isMobile: boolean }>) {
   const [enterForNewline, setEnterForNewline] = useSetting(settingsAtom, 'enterForNewline');
   const [editorToolbar, setEditorToolbar] = useSetting(settingsAtom, 'editorToolbar');
+  const [alwaysInlineEditor, setAlwaysInlineEditor] = useSetting(
+    settingsAtom,
+    'alwaysInlineEditor'
+  );
   const [editorOldAddFile, setEditorOldAddFile] = useSetting(settingsAtom, 'editorOldAddFile');
   const [hideActivity, setHideActivity] = useSetting(settingsAtom, 'hideActivity');
   const [hideReads, setHideReads] = useSetting(settingsAtom, 'hideReads');
@@ -454,6 +458,16 @@ function Editor({ isMobile }: Readonly<{ isMobile: boolean }>) {
           }
         />
       </SequenceCard>
+      <SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
+        <SettingTile
+          title="Always Inline Editor"
+          focusId="always-inline-editor"
+          description="Always keep the last line of the text editor inline with UI buttons"
+          after={
+            <Switch variant="Primary" value={alwaysInlineEditor} onChange={setAlwaysInlineEditor} />
+          }
+        />
+      </SequenceCard>
       <SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
         <SettingTile
           title="Message Formatting Toolbar"
diff --git a/src/app/state/settings.ts b/src/app/state/settings.ts
index 44a4aa964..b9bc4dc18 100644
--- a/src/app/state/settings.ts
+++ b/src/app/state/settings.ts
@@ -117,6 +117,7 @@ export interface Settings {
   editorToolbar: boolean;
   editorOldAddFile: boolean;
   composerToolbarOpen: boolean;
+  alwaysInlineEditor: boolean;
   messageLayout: MessageLayout;
   messageSpacing: MessageSpacing;
   hideMembershipEvents: boolean;
@@ -288,6 +289,7 @@ export const defaultSettings: Settings = {
   editorToolbar: false,
   editorOldAddFile: false,
   composerToolbarOpen: false,
+  alwaysInlineEditor: false,
   messageLayout: 0,
   messageSpacing: '400',
   hideMembershipEvents: false,