diff --git a/cursor/keybindings.json b/cursor/keybindings.json
index 974ecf9..b1a63ce 100644
--- a/cursor/keybindings.json
+++ b/cursor/keybindings.json
@@ -260,6 +260,13 @@
   // Text manipulation
   // ===========================================================================
   //
+  { // Set indentation to correct level.
+    // This was borrowed from the awesome-emacs-keymap extension and modifed to
+    // add the `!cpp.shouldAcceptTab` condition for the sake of Cursor.
+    "key": "tab",
+    "command": "emacs-mcx.tabToTabStop",
+    "when": "editorTextFocus && !editorReadonly && !inlineSuggestionVisible && !editorHoverFocused && !editorTabMovesFocus && !suggestWidgetVisible && !inSnippetMode && !editorTabCompletion && !editorParameterHintsVisible && !cursorAtInlineEdit && !cpp.shouldAcceptTab"
+  },
   { // Comment line.
     "key": "ctrl+c /",
     "command": "editor.action.commentLine",
diff --git a/cursor/settings.json b/cursor/settings.json
index 04ff60b..9213fab 100644
--- a/cursor/settings.json
+++ b/cursor/settings.json
@@ -77,7 +77,7 @@
   // Extension URL:
   // - https://marketplace.visualstudio.com/items?itemName=tuttieee.emacs-mcx
   //
-  "emacs-mcx.emacsLikeTab": true,
+  "emacs-mcx.emacsLikeTab": false,
   "emacs-mcx.killRingMax": 120,
   "emacs-mcx.markRingMax": 32,
   //