diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index cd421c249d8da..8f02018b19e04 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -668,6 +668,8 @@ impl Build {
             job::setup(self);
         }
 
+        // Download rustfmt early so that it can be used in rust-analyzer configs.
+        let _ = &builder::Builder::new(&self).initial_rustfmt();
         self.maybe_update_submodules();
 
         if let Subcommand::Format { check, paths } = &self.config.cmd {