diff --git a/layers/+filetree/treemacs/funcs.el b/layers/+filetree/treemacs/funcs.el
index f45e746b7..be400dbff 100644
--- a/layers/+filetree/treemacs/funcs.el
+++ b/layers/+filetree/treemacs/funcs.el
@@ -21,8 +21,9 @@
       (treemacs-do-add-project-to-workspace path name)
       (treemacs-select-window))))
 
-(defun spacemacs/treemacs-toggle-locked-width-off ()
-  "Unlock the manual resizing of the treemacs window."
+(defun spacemacs/treemacs-setup-width-lock ()
+  "Setup the width lock of treemacs buffer based on
+`treemacs-lock-width'."
   (interactive)
-  (when treemacs--width-is-locked
+  (when (xor treemacs--width-is-locked treemacs-lock-width)
     (treemacs-toggle-fixed-width)))
diff --git a/layers/+filetree/treemacs/packages.el b/layers/+filetree/treemacs/packages.el
index c83fca12b..9c02ec351 100644
--- a/layers/+filetree/treemacs/packages.el
+++ b/layers/+filetree/treemacs/packages.el
@@ -41,9 +41,8 @@
             treemacs-never-persist nil
             treemacs-goto-tag-strategy 'refetch-index
             treemacs-collapse-dirs treemacs-use-collapsed-directories)
-      (unless treemacs-lock-width
-        (add-hook 'treemacs-mode-hook
-                  'spacemacs/treemacs-toggle-locked-width-off))
+      (add-hook 'treemacs-mode-hook
+                #'spacemacs/treemacs-setup-width-lock)
       (spacemacs/set-leader-keys
         "ft"    'treemacs
         "fB"    'treemacs-bookmark