diff --git a/layers/+tools/shell/packages.el b/layers/+tools/shell/packages.el
index 7a1c405f6..7ab42eef0 100644
--- a/layers/+tools/shell/packages.el
+++ b/layers/+tools/shell/packages.el
@@ -20,6 +20,7 @@
         helm
         magit
         multi-term
+        org
         projectile
         (shell :location built-in)
         shell-pop
@@ -249,6 +250,10 @@ is achieved by adding the relevant text properties."
           (projectile-with-default-dir (projectile-project-root) (multi-term)))
         (spacemacs/set-leader-keys "p$t" 'projectile-multi-term-in-root)))))
 
+(defun shell/pre-init-org ()
+  (spacemacs|use-package-add-hook org
+    :post-config (add-to-list 'org-babel-load-languages '(shell . t))))
+
 (defun shell/post-init-projectile ()
   (spacemacs/set-leader-keys "p'" 'spacemacs/projectile-shell-pop))