diff --git a/core/core-editor.el b/core/core-editor.el
index 5f45b0715..ee6f9e4fa 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -85,7 +85,6 @@
            windows))
 (winner-mode 1)
 
-
 ;; Let editorconfig handle global whitespace settings
 (use-package editorconfig :demand t
   :mode ("\\.?editorconfig$" . editorconfig-conf-mode)
@@ -95,6 +94,16 @@
   (add-hook! 'editorconfig-custom-hooks
     (if indent-tabs-mode (whitespace-mode +1))))
 
+;; Ediff
+(setq ediff-diff-options           "-w"
+      ediff-split-window-function 'split-window-horizontally
+      ;; no extra frames
+      ediff-window-setup-function 'ediff-setup-windows-plain)
+
+(defvar doom-ediff-enabled nil)
+(add-hook! ediff-startup (setq doom-ediff-enabled t))
+(add-hook! ediff-quit    (setq doom-ediff-enabled nil))
+
 
 ;;
 ;; Hooks 'n hacks
diff --git a/core/core.el b/core/core.el
index 69ad3bc8e..221ea39cd 100644
--- a/core/core.el
+++ b/core/core.el
@@ -123,9 +123,6 @@ major-modes, the process gets killed.")
       confirm-nonexistent-file-or-buffer t
       delete-by-moving-to-trash          t
       echo-keystrokes                    0.02        ; show me what I type
-      ediff-diff-options                 "-w"
-      ediff-split-window-function       'split-window-horizontally  ; side-by-side diffs
-      ediff-window-setup-function       'ediff-setup-windows-plain  ; no extra frames
       enable-recursive-minibuffers       nil         ; no minibufferception
       idle-update-delay                  5           ; update a little less often
       major-mode                        'text-mode