diff --git a/web/src/hooks/useComposerToolbarLayout.test.ts b/web/src/hooks/useComposerToolbarLayout.test.ts
index e01d8b05..fa1eedf6 100644
--- a/web/src/hooks/useComposerToolbarLayout.test.ts
+++ b/web/src/hooks/useComposerToolbarLayout.test.ts
@@ -5,6 +5,23 @@ import {
     normalizeComposerToolbarLayout,
 } from './useComposerToolbarLayout'
 
+describe('DEFAULT_COMPOSER_TOOLBAR_LAYOUT', () => {
+    it('keeps abort last in the default order', () => {
+        expect(DEFAULT_COMPOSER_TOOLBAR_LAYOUT.left).toEqual([
+            'attachment',
+            'settings',
+            'piModel',
+            'piThinking',
+            'terminal',
+            'switch',
+            'voiceMic',
+            'scratchlist',
+            'schedule',
+            'abort',
+        ])
+    })
+})
+
 describe('normalizeComposerToolbarLayout', () => {
     beforeEach(() => localStorage.clear())
 
diff --git a/web/src/hooks/useComposerToolbarLayout.ts b/web/src/hooks/useComposerToolbarLayout.ts
index c732aa70..ac7ea082 100644
--- a/web/src/hooks/useComposerToolbarLayout.ts
+++ b/web/src/hooks/useComposerToolbarLayout.ts
@@ -25,7 +25,10 @@ export type ComposerToolbarLayout = {
 
 export const DEFAULT_COMPOSER_TOOLBAR_LAYOUT: ComposerToolbarLayout = {
     mode: 'left',
-    left: [...COMPOSER_TOOLBAR_ITEM_IDS],
+    left: [
+        ...COMPOSER_TOOLBAR_ITEM_IDS.filter((item) => item !== 'abort'),
+        'abort',
+    ],
     right: [],
 }