diff --git a/src/components/ha-code-editor.ts b/src/components/ha-code-editor.ts
index eb092ec02d..4946fd9e8a 100644
--- a/src/components/ha-code-editor.ts
+++ b/src/components/ha-code-editor.ts
@@ -131,7 +131,14 @@ export class HaCodeEditor extends UpdatingElement {
           loaded.lineNumbers(),
           loaded.keymap.of([
             ...loaded.defaultKeymap,
-            loaded.defaultTabBinding,
+            {
+              key: "Tab",
+              run: loaded.indentMore,
+            },
+            {
+              key: "Shift-Tab",
+              run: loaded.indentLess,
+            },
             saveKeyBinding,
           ]),
           loaded.tagExtension(modeTag, this._mode),
diff --git a/src/resources/codemirror.ts b/src/resources/codemirror.ts
index 25b31c66c4..35497aaaa3 100644
--- a/src/resources/codemirror.ts
+++ b/src/resources/codemirror.ts
@@ -7,7 +7,7 @@ import { yaml } from "@codemirror/legacy-modes/mode/yaml";
 export { keymap } from "@codemirror/view";
 export { CMEditorView as EditorView };
 export { EditorState, Prec, tagExtension } from "@codemirror/state";
-export { defaultKeymap, defaultTabBinding } from "@codemirror/commands";
+export { defaultKeymap, indentLess, indentMore } from "@codemirror/commands";
 export { lineNumbers } from "@codemirror/gutter";
 
 export const langs = {