diff --git a/plugins/tiddlywiki/codemirror/config/extraKeysTW.tid b/plugins/tiddlywiki/codemirror/config/extraKeysTW.tid
index 1be220f75..1c84e91a1 100644
--- a/plugins/tiddlywiki/codemirror/config/extraKeysTW.tid
+++ b/plugins/tiddlywiki/codemirror/config/extraKeysTW.tid
@@ -11,5 +11,7 @@ type: json
 	"Alt-T": "transposeChars",
 	"Alt-U": "undoSelection",
 	"Shift-Alt-U": "redoSelection",
-	"Cmd-U": ""
+	"Cmd-U": "",
+	"Tab": "indentAuto()",
+	"Enter": "newLineAndIndent()"
 }
diff --git a/plugins/tiddlywiki/codemirror/config/indentWithTabs.tid b/plugins/tiddlywiki/codemirror/config/indentWithTabs.tid
new file mode 100644
index 000000000..4b8d68903
--- /dev/null
+++ b/plugins/tiddlywiki/codemirror/config/indentWithTabs.tid
@@ -0,0 +1,3 @@
+title: $:/config/codemirror/indentWithTabs
+type: bool
+text: true
diff --git a/plugins/tiddlywiki/codemirror/config/smartIndent.tid b/plugins/tiddlywiki/codemirror/config/smartIndent.tid
new file mode 100644
index 000000000..62faa8a49
--- /dev/null
+++ b/plugins/tiddlywiki/codemirror/config/smartIndent.tid
@@ -0,0 +1,3 @@
+title: $:/config/codemirror/smartIndent
+type: bool
+text: true
diff --git a/plugins/tiddlywiki/codemirror/config/tabSize.tid b/plugins/tiddlywiki/codemirror/config/tabSize.tid
index 58559a055..93285fded 100644
--- a/plugins/tiddlywiki/codemirror/config/tabSize.tid
+++ b/plugins/tiddlywiki/codemirror/config/tabSize.tid
@@ -1,3 +1,3 @@
 title: $:/config/codemirror/tabSize
 type: integer
-text: 4
+text: 2