diff --git a/CHANGELOG.develop b/CHANGELOG.develop
index c35a36918..12baf6cc2 100644
--- a/CHANGELOG.develop
+++ b/CHANGELOG.develop
@@ -1617,6 +1617,8 @@ Benner and Paweł Siudak):
 - Fixed error void: =evil-surround-pairs-alist= (thanks to Sylvain Benner)
 - Add warning against manually loading org (thanks to Maximilian Wolff)
 - Add a toggle for bringing in org-trello (thanks to Magnus Therning)
+- Add the org-mode keybindings to the org-journal major mode (thanks to Marty
+  Buchaus)
 **** Osx
 - Fix OSX mapping issue (thanks to Joey Liu)
 - Added layer variables to customize modifier behaviors on macOS:
diff --git a/layers/+emacs/org/packages.el b/layers/+emacs/org/packages.el
index 5b17df15e..9e6384081 100644
--- a/layers/+emacs/org/packages.el
+++ b/layers/+emacs/org/packages.el
@@ -675,6 +675,8 @@ Headline^^            Visit entry^^               Filter^^                    Da
         "aojj" 'org-journal-new-entry
         "aojs" 'org-journal-search-forever)
 
+      (setq spacemacs-org-journal-mode-map (copy-keymap spacemacs-org-mode-map))
+
       (spacemacs/set-leader-keys-for-major-mode 'calendar-mode
         "r" 'org-journal-read-entry
         "i" 'org-journal-new-date-entry
@@ -688,7 +690,9 @@ Headline^^            Visit entry^^               Filter^^                    Da
       (spacemacs/set-leader-keys-for-major-mode 'org-journal-mode
         "j" 'org-journal-new-entry
         "n" 'org-journal-open-next-entry
-        "p" 'org-journal-open-previous-entry))))
+        "p" 'org-journal-open-previous-entry)
+
+      (spacemacs//init-leader-mode-map 'org-journal-mode 'spacemacs-org-journal-mode-map))))
 
 (defun org/init-ox-hugo ()
   (use-package ox-hugo :after ox))