diff --git a/layers/+emacs/org/README.org b/layers/+emacs/org/README.org
index 4c5687e6031b..6621de240c9c 100644
--- a/layers/+emacs/org/README.org
+++ b/layers/+emacs/org/README.org
@@ -570,7 +570,11 @@ To enable it by default, set the =org-enable-modern-support= to =t=:
    '((org :variables org-enable-modern-support t)))
 #+END_SRC
 
-To toggle its features, either call ~M-x org-modern-mode~ or ~ESC , T m~.
+To toggle its features in the current buffer, press either ~M-x
+org-modern-mode~ or ~, T m~.
+
+To toggle its features in all org buffers (and agenda buffers), press
+either ~M-x global-org-modern-mode~ or ~, T M~.
 
 Org-modern and valign (above) both provide visual enhancements for org
 tables (if =org-modern-table= is non-nil), and they are not compatible
diff --git a/layers/+emacs/org/packages.el b/layers/+emacs/org/packages.el
index 57d016c2f85d..fbcac7d55a60 100644
--- a/layers/+emacs/org/packages.el
+++ b/layers/+emacs/org/packages.el
@@ -749,13 +749,12 @@ Headline^^            Visit entry^^               Filter^^                    Da
 
 (defun org/init-org-modern ()
   (use-package org-modern
-    :defer t
-    :init
-    (add-hook 'org-mode-hook 'org-modern-mode)
-    (add-hook 'org-agenda-finalize-hook #'org-modern-agenda)
-
+    :after org
+    :config
+    (global-org-modern-mode)
     (spacemacs/set-leader-keys-for-major-mode 'org-mode
-      "Tm" 'org-modern-mode)))
+      "Tm" 'org-modern-mode
+      "TM" 'global-org-modern-mode)))
 
 (defun org/init-org-pomodoro ()
   (use-package org-pomodoro
diff --git a/layers/+spacemacs/spacemacs-org/packages.el b/layers/+spacemacs/spacemacs-org/packages.el
index eda5a460220d..a2f2845f2653 100644
--- a/layers/+spacemacs/spacemacs-org/packages.el
+++ b/layers/+spacemacs/spacemacs-org/packages.el
@@ -33,7 +33,7 @@
     ;; layer. So it is easier for users to steal the ownership of the
     ;; `org' package.
     (default-org-config :location built-in)
-    org-superstar
+    (org-superstar :toggle (not (configuration-layer/package-used-p 'org-modern)))
     (space-doc :location (recipe :fetcher local))
     toc-org
     ))