diff --git a/codemirror-dont-intercept-tab-key.patch b/codemirror-dont-intercept-tab-key.patch
new file mode 100644
index 0000000..9014608
--- /dev/null
+++ b/codemirror-dont-intercept-tab-key.patch
@@ -0,0 +1,71 @@
+From eaf3469f6bec7db767d2618e92b16140766ff712 Mon Sep 17 00:00:00 2001
+From: Kiara Grouwstra <kiara@bij1.org>
+Date: Wed, 11 Jan 2023 23:35:59 +0100
+Subject: [PATCH] don't intercept tab key fixes
+ https://github.com/Ionaru/easy-markdown-editor/issues/515
+
+---
+ keymap/emacs.js     | 1 -
+ keymap/sublime.js   | 2 --
+ src/input/keymap.js | 1 -
+ lib/codemirror.js   | 1 -
+ 4 files changed, 5 deletions(-)
+
+diff --git a/keymap/emacs.js b/keymap/emacs.js
+index f4e4e90e..819f0d01 100644
+--- a/keymap/emacs.js
++++ b/keymap/emacs.js
+@@ -519,7 +519,6 @@
+     "Alt-/": "autocomplete",
+     "Enter": "newlineAndIndent",
+     "Ctrl-J": "newline",
+-    "Tab": "indentAuto",
+     "Alt-G G": "gotoLine",
+     "Ctrl-X Tab": "indentRigidly",
+     "Ctrl-X Ctrl-X": "exchangePointAndMark",
+diff --git a/keymap/sublime.js b/keymap/sublime.js
+index fe677c84..335f59c7 100644
+--- a/keymap/sublime.js
++++ b/keymap/sublime.js
+@@ -589,7 +589,6 @@
+   var keyMap = CodeMirror.keyMap;
+   keyMap.macSublime = {
+     "Cmd-Left": "goLineStartSmart",
+-    "Shift-Tab": "indentLess",
+     "Shift-Ctrl-K": "deleteLine",
+     "Alt-Q": "wrapLines",
+     "Ctrl-Left": "goSubwordLeft",
+@@ -652,7 +651,6 @@
+   CodeMirror.normalizeKeyMap(keyMap.macSublime);
+ 
+   keyMap.pcSublime = {
+-    "Shift-Tab": "indentLess",
+     "Shift-Ctrl-K": "deleteLine",
+     "Alt-Q": "wrapLines",
+     "Ctrl-T": "transposeChars",
+diff --git a/src/input/keymap.js b/src/input/keymap.js
+index 2df588de..1aec191d 100644
+--- a/src/input/keymap.js
++++ b/src/input/keymap.js
+@@ -9,7 +9,6 @@ keyMap.basic = {
+   "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown",
+   "End": "goLineEnd", "Home": "goLineStartSmart", "PageUp": "goPageUp", "PageDown": "goPageDown",
+   "Delete": "delCharAfter", "Backspace": "delCharBefore", "Shift-Backspace": "delCharBefore",
+-  "Tab": "defaultTab", "Shift-Tab": "indentAuto",
+   "Enter": "newlineAndIndent", "Insert": "toggleOverwrite",
+   "Esc": "singleSelection"
+ }
+diff --git a/lib/codemirror.js b/lib/codemirror.js
+--- a/lib/codemirror.js
++++ b/lib/codemirror.js
+@@ -6731,7 +6731,6 @@
+     "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown",
+     "End": "goLineEnd", "Home": "goLineStartSmart", "PageUp": "goPageUp", "PageDown": "goPageDown",
+     "Delete": "delCharAfter", "Backspace": "delCharBefore", "Shift-Backspace": "delCharBefore",
+-    "Tab": "defaultTab", "Shift-Tab": "indentAuto",
+     "Enter": "newlineAndIndent", "Insert": "toggleOverwrite",
+     "Esc": "singleSelection"
+   };
+-- 
+2.37.2
+
diff --git a/gulpfile.js b/gulpfile.js
index efeb263..8c6b9ee 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -11,6 +11,8 @@ var eslint = require('gulp-eslint');
 var browserify = require('browserify');
 var source = require('vinyl-source-stream');
 var rename = require('gulp-rename');
+var { existsSync } = require('node:fs');
+var { exec } = require('child_process');
 
 var banner = ['/**',
     ' * <%= pkg.name %> v<%= pkg.version %>',
@@ -53,13 +55,27 @@ function styles() {
         .pipe(gulp.dest('./dist/'));
 }
 
+function patch() {
+    var is_top = existsSync('./node_modules/codemirror');
+    var command = 'patch -tN -d ' + (is_top ? './node_modules' : '..') + '/codemirror -p1 < ./codemirror-dont-intercept-tab-key.patch | echo';
+    exec(command, (err, stdout, stderr) => {
+        if (err) {
+            console.error(err)
+        } else {
+            console.log(`stdout: ${stdout}`);
+            console.log(`stderr: ${stderr}`);
+        }
+    });
+    return Promise.resolve();
+}
+
 // Watch for file changes
 function watch() {
     gulp.watch('./src/js/**/*.js', scripts);
     gulp.watch(css_files, styles);
 }
 
-var build = gulp.parallel(gulp.series(lint, scripts), styles);
+var build = gulp.parallel(gulp.series(patch, lint, scripts), styles);
 
 gulp.task('default', build);
 gulp.task('watch', gulp.series(build, watch));
diff --git a/src/js/easymde.js b/src/js/easymde.js
index 93b3cde..6220cd4 100644
--- a/src/js/easymde.js
+++ b/src/js/easymde.js
@@ -2100,8 +2100,6 @@ EasyMDE.prototype.render = function (el) {
     }
 
     keyMaps['Enter'] = 'newlineAndIndentContinueMarkdownList';
-    keyMaps['Tab'] = 'tabAndIndentMarkdownList';
-    keyMaps['Shift-Tab'] = 'shiftTabAndUnindentMarkdownList';
     keyMaps['Esc'] = function (cm) {
         if (cm.getOption('fullScreen')) toggleFullScreen(self);
     };