diff --git a/settings/gui-settings.el b/settings/gui-settings.el
index 546ba70d..507f4037 100644
--- a/settings/gui-settings.el
+++ b/settings/gui-settings.el
@@ -367,6 +367,13 @@ see `awesome-tray-mode-hook'"
   :init
   (require 'dirvish-autoloads)
   (dirvish-override-dired-mode)
+  (defun my-dirvish-subtree-toggle-or-open ()
+    "Same as `dirvish-subtree-toggle-or-open' but for keyboard."
+    (interactive)
+    (let ((entry (dired-get-filename nil t)))
+      (if (file-directory-p entry)
+          (dirvish-subtree-toggle)
+        (dirvish--find-entry 'find-file entry) )))
   :bind ; Bind `dirvish-fd|dirvish-side|dirvish-dwim' as you see fit
   (("C-c f" . dirvish)
    ("C-c s" . dirvish-side)
@@ -388,6 +395,7 @@ see `awesome-tray-mode-hook'"
    ("M-f" . dirvish-history-go-forward)
    ("M-b" . dirvish-history-go-backward)
    ("M-e" . dirvish-emerge-menu)
+   ("RET" . my-dirvish-subtree-toggle-or-open)
    ("<mouse-1>" . dirvish-subtree-toggle-or-open)
    ("<mouse-2>" . dired-mouse-find-file-other-window)
    ("<mouse-3>" . dired-mouse-find-file))
@@ -401,6 +409,7 @@ see `awesome-tray-mode-hook'"
    '(("h" "~/"                          "Home")
      ("d" "~/Downloads/"                "Downloads")
      ("m" "/mnt/"                       "Drives")
+     ("r" "/"                           "Root")
      ;; ("s" "/ssh:my-remote-server")      "SSH server"
      ;; ("e" "/sudo:root@localhost:/etc")  "Modify program settings"
      ;; ("t" "~/.local/share/Trash/files/" "TrashCan")