diff --git a/settings/org-settings.el b/settings/org-settings.el
index 88791eb9..57b6b280 100644
--- a/settings/org-settings.el
+++ b/settings/org-settings.el
@@ -538,13 +538,17 @@ Suggest the URL title as a description for resource."
   :bind (("C-c r l" . org-roam-buffer-toggle)
          ("C-c r L" . org-roam-buffer-display-dedicated)
          ("C-c r f" . org-roam-node-find)
-         ("C-c r i" . org-roam-node-insert)
+         ("C-c r n" . org-roam-node-random)
          ("C-c r c" . org-roam-capture)
-         ("C-c r a" . org-roam-alias-add)
-         ("C-c r A" . org-roam-alias-remove)
-         ("C-c r i" . org-id-get-create)  ;; create id for file or header
-         ("C-c r r" . org-roam-ref-add)
-         ("C-c r R" . org-roam-ref-remove)
+         (:map org-mode-map
+               (("C-c r i" . org-roam-node-insert)
+                ("C-c r a" . org-roam-alias-add)
+                ("C-c r A" . org-roam-alias-remove)
+                ("C-c r d" . org-id-get-create)  ;; create id for file or header
+                ("C-c r t" . org-roam-tag-add)
+                ("C-c r T" . org-roam-tag-remove)
+                ("C-c r r" . org-roam-ref-add)
+                ("C-c r R" . org-roam-ref-remove)))
          ;; Dailies
          ("C-c r j" . org-roam-dailies-capture-today))
   :init
@@ -562,6 +566,7 @@ Suggest the URL title as a description for resource."
 
 (use-package org-roam-ui
   :after (org-roam)
+  :commands (org-roam-ui-mode)
   :config
   (setq org-roam-ui-sync-theme t)
   (setq org-roam-ui-follow t)