diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index fea84c2964..c7d30230ea 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -400,7 +400,6 @@ pub fn initialize_workspace(app_state: Arc<AppState>, cx: &mut AppContext) {
             });
 
         workspace.focus_handle(cx).focus(cx);
-        load_default_keymap(cx);
     })
     .detach();
 }
@@ -571,6 +570,8 @@ pub fn handle_keymap_file_changes(
     })
     .detach();
 
+    load_default_keymap(cx);
+
     cx.spawn(move |cx| async move {
         let mut user_keymap = KeymapFile::default();
         loop {