diff --git a/layers/+filetree/neotree/packages.el b/layers/+filetree/neotree/packages.el
index 95560c30b..ea1df60e0 100644
--- a/layers/+filetree/neotree/packages.el
+++ b/layers/+filetree/neotree/packages.el
@@ -103,6 +103,7 @@ Navigation^^^^             Actions^^         Visual actions/config^^^
 
       (spacemacs/set-leader-keys
         "ft" 'neotree-toggle
+        "fT" 'neotree-show
         "pt" 'neotree-find-project-root))
     :config
     (spacemacs//neotree-key-bindings)))
@@ -110,9 +111,7 @@ Navigation^^^^             Actions^^         Visual actions/config^^^
 (defun neotree/pre-init-winum ()
   (spacemacs|use-package-add-hook winum
     :post-config
-    (add-to-list 'winum-assign-functions #'spacemacs//winum-neotree-assign-func)))
-
-(defun neotree/post-init-winum ()
-  (spacemacs/set-leader-keys
     ;; window 0 is reserved for file trees
-    "0" 'neotree-show))
+    (spacemacs/set-leader-keys "0" #'neotree-show)
+    (define-key winum-keymap (kbd "M-0") #'neotree-show)
+    (add-to-list 'winum-assign-functions #'spacemacs//winum-neotree-assign-func)))
diff --git a/layers/+filetree/treemacs/packages.el b/layers/+filetree/treemacs/packages.el
index 5af5705da..d09c5246f 100644
--- a/layers/+filetree/treemacs/packages.el
+++ b/layers/+filetree/treemacs/packages.el
@@ -24,11 +24,12 @@
 
 (defun treemacs/init-treemacs ()
   (use-package treemacs
-    :commands treemacs--window-number-ten
+    :commands (treemacs-select-window treemacs--window-number-ten)
     :defer t
     :init
     (spacemacs/set-leader-keys
       "ft"    #'treemacs-toggle
+      "fT"    #'treemacs
       "fB"    #'treemacs-bookmark
       "f C-t" #'treemacs-find-file)
     :config
@@ -76,5 +77,6 @@
   (spacemacs|use-package-add-hook winum
     :post-config
     (progn
-      (spacemacs/set-leader-keys "0" #'treemacs)
+      ;; window 0 is reserved for file trees
+      (spacemacs/set-leader-keys "0" #'treemacs-select-window)
       (define-key winum-keymap (kbd "M-0") #'treemacs-select-window))))