diff --git a/modules/lang/gdscript/config.el b/modules/lang/gdscript/config.el
index 9ab354a7b..55714e65f 100644
--- a/modules/lang/gdscript/config.el
+++ b/modules/lang/gdscript/config.el
@@ -13,6 +13,9 @@
   (set-lookup-handlers! 'gdscript-mode
     :documentation #'gdscript-docs-browse-symbol-at-point)
 
+  (when (executable-find "gdformat")
+    (set-formatter! 'gdformat '("gdformat" "-") :modes '(gdscript-mode)))
+
   (when (modulep! +lsp)
     (add-hook 'gdscript-mode-local-vars-hook #'lsp! 'append))
 
diff --git a/modules/lang/gdscript/doctor.el b/modules/lang/gdscript/doctor.el
new file mode 100644
index 000000000..2798524cc
--- /dev/null
+++ b/modules/lang/gdscript/doctor.el
@@ -0,0 +1,5 @@
+;;; lang/gdscript/doctor.el -*- lexical-binding: t; -*-
+
+(when (modulep! :editor format)
+  (unless (executable-find "gdformat")
+    (warn! "Couldn't find gdformat. Formatting will be disabled.")))