From ad20bc39c5fcf23018fe3fa9d616675b069db579 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Thu, 4 Jan 2024 15:31:00 -0800
Subject: [PATCH] Fix accidental load of default keymap *after* loading user
 keymap

Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Marshall <marshall@zed.dev>
---
 crates/zed/src/zed.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index fea84c296419c2a7f41a538ec026cdececeee99f..c7d30230ea035b29121ceb487e4ea3ce483d5d54 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 {