diff --git a/modules/lang/org/autoload/org.el b/modules/lang/org/autoload/org.el
index 9f2a545a3..53e182fd9 100644
--- a/modules/lang/org/autoload/org.el
+++ b/modules/lang/org/autoload/org.el
@@ -292,3 +292,9 @@ re-align the table if necessary. (Necessary because org-mode has a
       (org-shiftmetadown)
     (org-shiftmetaup)))
 
+;;;###autoload
+(defun +org/edit-special-same-window ()
+  (interactive)
+  (let ((shackle-rules '(("^\\*Org Src" :align t :select t :regexp t :noesc t :same t))))
+    (call-interactively 'org-edit-special)
+    (doom-buffer-mode +1)))
diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index 8c99d85b2..ac787c625 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -268,6 +268,7 @@
            :n  "d"  'org-time-stamp
            :n  "D"  'org-deadline
            :n  "e"  'org-edit-special
+           :n  "E"  '+org/edit-special-same-window
            :n  "n"  (λ! (if (buffer-narrowed-p) (widen) (org-narrow-to-subtree)))
            :n  "r"  'org-refile
            :n  "R"  (λ! (org-metaleft) (org-archive-to-archive-sibling)) ; archive to parent sibling