diff --git a/crates-tauri/yaak-app/src/lib.rs b/crates-tauri/yaak-app/src/lib.rs
index 2b1710cfd..5009597de 100644
--- a/crates-tauri/yaak-app/src/lib.rs
+++ b/crates-tauri/yaak-app/src/lib.rs
@@ -843,8 +843,10 @@ async fn cmd_send_ephemeral_request<R: Runtime>(
 }
 
 #[tauri::command]
-async fn cmd_format_json(text: &str) -> YaakResult<String> {
-    Ok(format_json(text, "  "))
+async fn cmd_format_json(text: &str, indent: Option<u32>) -> YaakResult<String> {
+    let n = indent.unwrap_or(2);
+    let indent_str = " ".repeat(n as usize);
+    Ok(format_json(text, &indent_str))
 }
 
 #[tauri::command]
diff --git a/crates/yaak-models/bindings/gen_models.ts b/crates/yaak-models/bindings/gen_models.ts
index da1da73cf..6743c66a2 100644
--- a/crates/yaak-models/bindings/gen_models.ts
+++ b/crates/yaak-models/bindings/gen_models.ts
@@ -75,7 +75,7 @@ export type ProxySetting = { "type": "enabled", http: string, https: string, aut
 
 export type ProxySettingAuth = { user: string, password: string, };
 
-export type Settings = { model: "settings", id: string, createdAt: string, updatedAt: string, appearance: string, clientCertificates: Array<ClientCertificate>, coloredMethods: boolean, editorFont: string | null, editorFontSize: number, editorKeymap: EditorKeymap, editorSoftWrap: boolean, hideWindowControls: boolean, useNativeTitlebar: boolean, interfaceFont: string | null, interfaceFontSize: number, interfaceScale: number, openWorkspaceNewWindow: boolean | null, proxy: ProxySetting | null, themeDark: string, themeLight: string, updateChannel: string, hideLicenseBadge: boolean, autoupdate: boolean, autoDownloadUpdates: boolean, checkNotifications: boolean, hotkeys: { [key in string]?: Array<string> }, };
+export type Settings = { model: "settings", id: string, createdAt: string, updatedAt: string, appearance: string, clientCertificates: Array<ClientCertificate>, coloredMethods: boolean, editorFont: string | null, editorFontSize: number, editorKeymap: EditorKeymap, editorIndentation: number, editorSoftWrap: boolean, hideWindowControls: boolean, useNativeTitlebar: boolean, interfaceFont: string | null, interfaceFontSize: number, interfaceScale: number, openWorkspaceNewWindow: boolean | null, proxy: ProxySetting | null, themeDark: string, themeLight: string, updateChannel: string, hideLicenseBadge: boolean, autoupdate: boolean, autoDownloadUpdates: boolean, checkNotifications: boolean, hotkeys: { [key in string]?: Array<string> }, };
 
 export type SyncState = { model: "sync_state", id: string, workspaceId: string, createdAt: string, updatedAt: string, flushedAt: string, modelId: string, checksum: string, relPath: string, syncDir: string, };
 
@@ -93,6 +93,6 @@ export type WebsocketMessageType = "text" | "binary";
 
 export type WebsocketRequest = { model: "websocket_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authentication: Record<string, any>, authenticationType: string | null, description: string, headers: Array<HttpRequestHeader>, message: string, name: string, sortPriority: number, url: string, urlParameters: Array<HttpUrlParameter>, };
 
-export type Workspace = { model: "workspace", id: string, createdAt: string, updatedAt: string, authentication: Record<string, any>, authenticationType: string | null, description: string, headers: Array<HttpRequestHeader>, name: string, encryptionKeyChallenge: string | null, settingValidateCertificates: boolean, settingFollowRedirects: boolean, settingRequestTimeout: number, settingDnsOverrides: Array<DnsOverride>, };
+export type Workspace = { model: "workspace", id: string, createdAt: string, updatedAt: string, authentication: Record<string, any>, authenticationType: string | null, description: string, headers: Array<HttpRequestHeader>, name: string, encryptionKeyChallenge: string | null, settingValidateCertificates: boolean, settingFollowRedirects: boolean, settingRequestTimeout: number, };
 
 export type WorkspaceMeta = { model: "workspace_meta", id: string, workspaceId: string, createdAt: string, updatedAt: string, encryptionKey: EncryptedKey | null, settingSyncDir: string | null, };
diff --git a/crates/yaak-models/migrations/20251127214940_add-editor-tab-indentation.sql b/crates/yaak-models/migrations/20251127214940_add-editor-tab-indentation.sql
new file mode 100644
index 000000000..4fe8d4780
--- /dev/null
+++ b/crates/yaak-models/migrations/20251127214940_add-editor-tab-indentation.sql
@@ -0,0 +1 @@
+ALTER TABLE settings ADD COLUMN editor_indentation INTEGER DEFAULT 2 NOT NULL;
\ No newline at end of file
diff --git a/crates/yaak-models/src/models.rs b/crates/yaak-models/src/models.rs
index 054017704..9a1403f29 100644
--- a/crates/yaak-models/src/models.rs
+++ b/crates/yaak-models/src/models.rs
@@ -146,6 +146,7 @@ pub struct Settings {
     pub editor_font: Option<String>,
     pub editor_font_size: i32,
     pub editor_keymap: EditorKeymap,
+    pub editor_indentation: i32,
     pub editor_soft_wrap: bool,
     pub hide_window_controls: bool,
     // When true (primarily on Windows/Linux), use the native OS window title bar and controls
@@ -204,6 +205,7 @@ impl UpsertModelInfo for Settings {
             (ClientCertificates, client_certificates.into()),
             (EditorFontSize, self.editor_font_size.into()),
             (EditorKeymap, self.editor_keymap.to_string().into()),
+            (EditorIndentation, self.editor_indentation.into()),
             (EditorSoftWrap, self.editor_soft_wrap.into()),
             (EditorFont, self.editor_font.into()),
             (InterfaceFont, self.interface_font.into()),
@@ -232,6 +234,7 @@ impl UpsertModelInfo for Settings {
             SettingsIden::ClientCertificates,
             SettingsIden::EditorFontSize,
             SettingsIden::EditorKeymap,
+            SettingsIden::EditorIndentation,
             SettingsIden::EditorSoftWrap,
             SettingsIden::EditorFont,
             SettingsIden::InterfaceFontSize,
@@ -271,6 +274,7 @@ impl UpsertModelInfo for Settings {
             editor_font_size: row.get("editor_font_size")?,
             editor_font: row.get("editor_font")?,
             editor_keymap: EditorKeymap::from_str(editor_keymap.as_str()).unwrap(),
+            editor_indentation: row.get("editor_indentation")?,
             editor_soft_wrap: row.get("editor_soft_wrap")?,
             interface_font_size: row.get("interface_font_size")?,
             interface_scale: row.get("interface_scale")?,
diff --git a/crates/yaak-models/src/queries/settings.rs b/crates/yaak-models/src/queries/settings.rs
index b44aee3ab..8d9a06688 100644
--- a/crates/yaak-models/src/queries/settings.rs
+++ b/crates/yaak-models/src/queries/settings.rs
@@ -24,6 +24,7 @@ impl<'a> DbContext<'a> {
             editor_font_size: 12,
             editor_font: None,
             editor_keymap: EditorKeymap::Default,
+            editor_indentation: 2,
             editor_soft_wrap: true,
             interface_font_size: 14,
             interface_scale: 1.0,
diff --git a/src-web/components/Settings/SettingsInterface.tsx b/src-web/components/Settings/SettingsInterface.tsx
index 5d9541251..11122dafd 100644
--- a/src-web/components/Settings/SettingsInterface.tsx
+++ b/src-web/components/Settings/SettingsInterface.tsx
@@ -32,6 +32,8 @@ const keymaps: { value: EditorKeymap; label: string }[] = [
   { value: 'emacs', label: 'Emacs' },
 ];
 
+const tabIndentOptions = [2, 4, 6, 8, 10].map((n) => ({ label: `${n}`, value: `${n}` }));
+
 export function SettingsInterface() {
   const workspace = useAtomValue(activeWorkspaceAtom);
   const settings = useAtomValue(settingsAtom);
@@ -148,6 +150,18 @@ export function SettingsInterface() {
         options={keymaps}
         onChange={(v) => patchModel(settings, { editorKeymap: v })}
       />
+      <Select
+        leftSlot={<Icon icon="arrow_big_right_dash" color="secondary" />}
+        size="sm"
+        name="editorIndentation"
+        label="Editor indentation"
+        defaultValue="2"
+        value={`${settings.editorIndentation}`}
+        options={tabIndentOptions}
+        onChange={(v) =>
+          patchModel(settings, { editorIndentation: clamp(Number.parseInt(v, 10) || 2, 2, 10) })
+        }
+      />
       <Checkbox
         checked={settings.editorSoftWrap}
         title="Wrap editor lines"
diff --git a/src-web/components/core/Editor/Editor.tsx b/src-web/components/core/Editor/Editor.tsx
index 829211fef..a5ed9b7d2 100644
--- a/src-web/components/core/Editor/Editor.tsx
+++ b/src-web/components/core/Editor/Editor.tsx
@@ -1,6 +1,6 @@
 import { startCompletion } from '@codemirror/autocomplete';
 import { defaultKeymap, historyField, indentWithTab } from '@codemirror/commands';
-import { foldState, forceParsing } from '@codemirror/language';
+import { foldState, forceParsing, indentUnit } from '@codemirror/language';
 import type { EditorStateConfig, Extension } from '@codemirror/state';
 import { Compartment, EditorState } from '@codemirror/state';
 import { EditorView, keymap, placeholder as placeholderExt, tooltips } from '@codemirror/view';
@@ -68,12 +68,13 @@ export interface EditorProps {
   autocompleteVariables?: boolean | ((v: WrappedEnvironmentVariable) => boolean);
   className?: string;
   defaultValue?: string | null;
+  tabIndent?: number;
   disableTabIndent?: boolean;
   disabled?: boolean;
   extraExtensions?: Extension[] | Extension;
   forcedEnvironmentId?: string;
   forceUpdateKey?: string | number;
-  format?: (v: string) => Promise<string>;
+  format?: (v: string, indent?: number) => Promise<string>;
   heightMode?: 'auto' | 'full';
   hideGutter?: boolean;
   id?: string;
@@ -114,6 +115,7 @@ function EditorInner({
   autocompleteVariables,
   className,
   defaultValue,
+  tabIndent,
   disableTabIndent,
   disabled,
   extraExtensions,
@@ -154,6 +156,8 @@ function EditorInner({
     wrapLines = settings.editorSoftWrap;
   }
 
+  tabIndent = tabIndent ?? settings.editorIndentation;
+
   if (disabled) {
     readOnly = true;
   }
@@ -273,11 +277,14 @@ function EditorInner({
       if (disableTabIndent && current !== emptyExtension) return; // Nothing to do
       if (!disableTabIndent && current === emptyExtension) return; // Nothing to do
 
-      const ext = !disableTabIndent ? keymap.of([indentWithTab]) : emptyExtension;
+      const ext = !disableTabIndent
+        ? [keymap.of([indentWithTab]), indentUnit.of(' '.repeat(tabIndent))]
+        : emptyExtension;
+
       const effects = tabIndentCompartment.current.reconfigure(ext);
       cm.current?.view.dispatch({ effects });
     },
-    [disableTabIndent],
+    [disableTabIndent, tabIndent],
   );
 
   const onClickFunction = useCallback(
@@ -384,7 +391,9 @@ function EditorInner({
           placeholderCompartment.current.of(placeholderExt(placeholderElFromText(placeholder))),
           wrapLinesCompartment.current.of(wrapLines ? EditorView.lineWrapping : emptyExtension),
           tabIndentCompartment.current.of(
-            !disableTabIndent ? keymap.of([indentWithTab]) : emptyExtension,
+            !disableTabIndent
+              ? [keymap.of([indentWithTab]), indentUnit.of(' '.repeat(tabIndent))]
+              : emptyExtension,
           ),
           keymapCompartment.current.of(
             keymapExtensions[settings.editorKeymap] ?? keymapExtensions.default,
@@ -481,7 +490,7 @@ function EditorInner({
           onClick={async () => {
             if (cm.current === null) return;
             const { doc } = cm.current.view.state;
-            const formatted = await format(doc.toString());
+            const formatted = await format(doc.toString(), tabIndent);
             // Update editor and blur because the cursor will reset anyway
             cm.current.view.dispatch({
               changes: { from: 0, to: doc.length, insert: formatted },
@@ -505,7 +514,7 @@ function EditorInner({
       }),
     );
     return results;
-  }, [actions, format, onChange]);
+  }, [actions, format, tabIndent, onChange]);
 
   const cmContainer = (
     <div
diff --git a/src-web/hooks/useFormatText.ts b/src-web/hooks/useFormatText.ts
index 667a761f7..079045be4 100644
--- a/src-web/hooks/useFormatText.ts
+++ b/src-web/hooks/useFormatText.ts
@@ -1,6 +1,8 @@
 import { useQuery } from '@tanstack/react-query';
 import type { EditorProps } from '../components/core/Editor/Editor';
 import { tryFormatJson, tryFormatXml } from '../lib/formatters';
+import { useAtomValue } from 'jotai';
+import { settingsAtom } from '@yaakapp-internal/models';
 
 export function useFormatText({
   text,
@@ -11,9 +13,11 @@ export function useFormatText({
   language: EditorProps['language'];
   pretty: boolean;
 }) {
+  const settings = useAtomValue(settingsAtom);
+
   return useQuery({
     placeholderData: (prev) => prev, // Keep previous data on refetch
-    queryKey: [text, language, pretty],
+    queryKey: [text, language, pretty, settings.editorIndentation],
     queryFn: async () => {
       if (text === '' || !pretty) {
         return text;
diff --git a/src-web/lib/formatters.ts b/src-web/lib/formatters.ts
index f0d9bf373..4231c13b7 100644
--- a/src-web/lib/formatters.ts
+++ b/src-web/lib/formatters.ts
@@ -1,18 +1,21 @@
 import vkBeautify from 'vkbeautify';
 import { invokeCmd } from './tauri';
+import { getSettings } from './settings';
 
 export async function tryFormatJson(text: string): Promise<string> {
   if (text === '') return text;
 
+  const settings = await getSettings();
+  const indent = settings.editorIndentation;
+
   try {
-    const result = await invokeCmd<string>('cmd_format_json', { text });
-    return result;
+    return await invokeCmd<string>('cmd_format_json', { text, indent });
   } catch (err) {
     console.warn('Failed to format JSON', err);
   }
 
   try {
-    return JSON.stringify(JSON.parse(text), null, 2);
+    return JSON.stringify(JSON.parse(text), null, indent);
   } catch (err) {
     console.log('JSON beautify failed', err);
   }
@@ -23,8 +26,11 @@ export async function tryFormatJson(text: string): Promise<string> {
 export async function tryFormatXml(text: string): Promise<string> {
   if (text === '') return text;
 
+  const settings = await getSettings();
+  const indent = settings.editorIndentation;
+
   try {
-    return vkBeautify.xml(text, '  ');
+    return vkBeautify.xml(text, ' '.repeat(indent));
   } catch (err) {
     console.warn('Failed to format XML', err);
   }