diff --git a/init/core-editor.el b/init/core-editor.el
index 5f57bea71..4c6933b4e 100644
--- a/init/core-editor.el
+++ b/init/core-editor.el
@@ -194,7 +194,6 @@ returns nil."
 ;;   d) and not do any of this magic when inside a string
 (-imap (kbd "SPC")                              'my.inflate-space-maybe
        [remap backward-delete-char-untabify]    'my.deflate-space-maybe
-       [remap delete-backward-char]             'my.deflate-space-maybe
        [remap newline]                          'my.newline-and-indent
 
        ;; Smarter move-to-beginning-of-line
diff --git a/init/my-keymaps.el b/init/my-keymaps.el
index f57ca42ce..54ba56c38 100644
--- a/init/my-keymaps.el
+++ b/init/my-keymaps.el
@@ -130,6 +130,8 @@
         (kbd "<M-kp-delete>") 'evil-join
 
         ;; Newline magic
+        (kbd "<S-backspace>") 'backward-delete-char
+        (kbd "<backspace>")   'backward-delete-char-untabify
         (kbd "<C-return>")    'evil-ret-and-indent
         (kbd "<M-return>")    (kbd "<return> DEL") ; newline and dedent