diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el
index 6ab5236..4c33a5d 100644
--- a/user/app/doom-emacs/config.el
+++ b/user/app/doom-emacs/config.el
@@ -295,8 +295,13 @@
 (setq org-side-tree-persistent nil)
 (setq org-side-tree-fontify t)
 (setq org-side-tree-enable-folding t)
+(defun org-side-tree-create-or-toggle ()
+  (interactive)
+  (if (or (org-side-tree-has-tree-p) (eq major-mode 'org-side-tree-mode))
+      (org-side-tree-toggle)
+      (org-side-tree)))
 (map! :leader
-      "O t" #'org-side-tree-toggle)
+      "O t" #'org-side-tree-create-or-toggle)
 (map! :map org-side-tree-mode-map
       "SPC" nil)
 
diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org
index b92f470..1e41504 100644
--- a/user/app/doom-emacs/doom.org
+++ b/user/app/doom-emacs/doom.org
@@ -364,8 +364,13 @@ Doom Emacs is traditionally installed by cloning the repository ([[https://githu
 (setq org-side-tree-persistent nil)
 (setq org-side-tree-fontify t)
 (setq org-side-tree-enable-folding t)
+(defun org-side-tree-create-or-toggle ()
+  (interactive)
+  (if (or (org-side-tree-has-tree-p) (eq major-mode 'org-side-tree-mode))
+      (org-side-tree-toggle)
+      (org-side-tree)))
 (map! :leader
-      "O t" #'org-side-tree-toggle)
+      "O t" #'org-side-tree-create-or-toggle)
 (map! :map org-side-tree-mode-map
       "SPC" nil)