diff --git a/modules/config/default/+emacs-bindings.el b/modules/config/default/+emacs-bindings.el
index f19b0382d..ac6310c75 100644
--- a/modules/config/default/+emacs-bindings.el
+++ b/modules/config/default/+emacs-bindings.el
@@ -43,7 +43,6 @@
         :desc "List errors"                         "x"   #'flycheck-list-errors)
        (:when (featurep! :tools lsp)
         :desc "LSP Code actions"                      "a"   #'lsp-execute-code-action
-        :desc "LSP Format buffer/region"              "F"   #'+default/lsp-format-region-or-buffer
         :desc "LSP Organize imports"                  "i"   #'lsp-organize-imports
         :desc "LSP Rename"                            "r"   #'lsp-rename
         (:after lsp-mode
diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el
index f848fef5c..2cc5d3f40 100644
--- a/modules/config/default/+evil-bindings.el
+++ b/modules/config/default/+evil-bindings.el
@@ -360,7 +360,6 @@
        :desc "Jump to documentation"                 "k"   #'+lookup/documentation
        (:when (featurep! :tools lsp)
         :desc "LSP Execute code action"               "a"   #'lsp-execute-code-action
-        :desc "LSP Format buffer/region"              "F"   #'+default/lsp-format-region-or-buffer
         :desc "LSP Organize imports"                  "i"   #'lsp-organize-imports
         :desc "LSP Rename"                            "r"   #'lsp-rename
         (:after lsp-mode
diff --git a/modules/editor/format/autoload/format.el b/modules/editor/format/autoload/format.el
index 84f6874dd..40ca96f73 100644
--- a/modules/editor/format/autoload/format.el
+++ b/modules/editor/format/autoload/format.el
@@ -219,9 +219,11 @@ snippets or single lines."
 is selected)."
   (interactive)
   (call-interactively
-   (if (use-region-p)
-       #'+format/region
-     #'+format/buffer)))
+   (if (bound-and-true-p lsp-mode)
+       #'+default/lsp-format-region-or-buffer
+     (if (use-region-p)
+         #'+format/region
+       #'+format/buffer))))
 
 
 ;;