diff --git a/crates/gpui2/src/app.rs b/crates/gpui2/src/app.rs
index d23d6e3d9d15003ab3236a6d491143f25d1f48de..0715ace9eaf8ca0de7fabcb635264e361fc09dad 100644
--- a/crates/gpui2/src/app.rs
+++ b/crates/gpui2/src/app.rs
@@ -1052,16 +1052,7 @@ impl AppContext {
     }
 
     pub fn set_menus(&mut self, menus: Vec<Menu>) {
-        if let Some(active_window) = self.active_window() {
-            active_window
-                .update(self, |_, cx| {
-                    cx.platform
-                        .set_menus(menus, Some(&cx.window.current_frame.dispatch_tree));
-                })
-                .ok();
-        } else {
-            self.platform.set_menus(menus, None);
-        }
+        self.platform.set_menus(menus, &self.keymap.lock());
     }
 
     pub fn dispatch_action(&mut self, action: &dyn Action) {
diff --git a/crates/gpui2/src/platform.rs b/crates/gpui2/src/platform.rs
index 7bcd91a5e07dbc03a52fedd6837b9e06c542c6f4..66cf7c14efb95ad520083122a900f9ff900c7e94 100644
--- a/crates/gpui2/src/platform.rs
+++ b/crates/gpui2/src/platform.rs
@@ -6,8 +6,8 @@ mod mac;
 mod test;
 
 use crate::{
-    point, size, Action, AnyWindowHandle, BackgroundExecutor, Bounds, DevicePixels, DispatchTree,
-    Font, FontId, FontMetrics, FontRun, ForegroundExecutor, GlobalPixels, GlyphId, InputEvent,
+    point, size, Action, AnyWindowHandle, BackgroundExecutor, Bounds, DevicePixels, Font, FontId,
+    FontMetrics, FontRun, ForegroundExecutor, GlobalPixels, GlyphId, InputEvent, Keymap,
     LineLayout, Pixels, Point, RenderGlyphParams, RenderImageParams, RenderSvgParams, Result,
     Scene, SharedString, Size, TaskLabel,
 };
@@ -92,7 +92,7 @@ pub(crate) trait Platform: 'static {
     fn on_reopen(&self, callback: Box<dyn FnMut()>);
     fn on_event(&self, callback: Box<dyn FnMut(InputEvent) -> bool>);
 
-    fn set_menus(&self, menus: Vec<Menu>, dispatch_tree: Option<&DispatchTree>);
+    fn set_menus(&self, menus: Vec<Menu>, keymap: &Keymap);
     fn on_app_menu_action(&self, callback: Box<dyn FnMut(&dyn Action)>);
     fn on_will_open_app_menu(&self, callback: Box<dyn FnMut()>);
     fn on_validate_app_menu_command(&self, callback: Box<dyn FnMut(&dyn Action) -> bool>);
diff --git a/crates/gpui2/src/platform/mac/platform.rs b/crates/gpui2/src/platform/mac/platform.rs
index 8a5ee676f7c9e76364e6aea27a9b064a917cca36..2deea545e164b3445dcd6388048eaf97b66e9102 100644
--- a/crates/gpui2/src/platform/mac/platform.rs
+++ b/crates/gpui2/src/platform/mac/platform.rs
@@ -1,7 +1,7 @@
 use super::{events::key_to_native, BoolExt};
 use crate::{
-    Action, AnyWindowHandle, BackgroundExecutor, ClipboardItem, CursorStyle, DispatchTree,
-    DisplayId, ForegroundExecutor, InputEvent, MacDispatcher, MacDisplay, MacDisplayLinker,
+    Action, AnyWindowHandle, BackgroundExecutor, ClipboardItem, CursorStyle, DisplayId,
+    ForegroundExecutor, InputEvent, Keymap, MacDispatcher, MacDisplay, MacDisplayLinker,
     MacTextSystem, MacWindow, Menu, MenuItem, PathPromptOptions, Platform, PlatformDisplay,
     PlatformTextSystem, PlatformWindow, Result, SemanticVersion, VideoTimestamp, WindowOptions,
 };
@@ -206,7 +206,7 @@ impl MacPlatform {
         menus: Vec<Menu>,
         delegate: id,
         actions: &mut Vec<Box<dyn Action>>,
-        dispatch_tree: Option<&DispatchTree>,
+        keymap: &Keymap,
     ) -> id {
         let application_menu = NSMenu::new(nil).autorelease();
         application_menu.setDelegate_(delegate);
@@ -217,7 +217,7 @@ impl MacPlatform {
             menu.setDelegate_(delegate);
 
             for item_config in menu_config.items {
-                menu.addItem_(self.create_menu_item(item_config, delegate, actions, dispatch_tree));
+                menu.addItem_(self.create_menu_item(item_config, delegate, actions, keymap));
             }
 
             let menu_item = NSMenuItem::new(nil).autorelease();
@@ -238,7 +238,7 @@ impl MacPlatform {
         item: MenuItem,
         delegate: id,
         actions: &mut Vec<Box<dyn Action>>,
-        dispatch_tree: Option<&DispatchTree>,
+        keymap: &Keymap,
     ) -> id {
         match item {
             MenuItem::Separator => NSMenuItem::separatorItem(nil),
@@ -247,11 +247,8 @@ impl MacPlatform {
                 action,
                 os_action,
             } => {
-                let bindings = dispatch_tree
-                    .map(|tree| tree.bindings_for_action(action.as_ref(), &tree.context_stack))
-                    .unwrap_or_default();
-                let keystrokes = bindings
-                    .iter()
+                let keystrokes = keymap
+                    .bindings_for_action(action.type_id())
                     .find(|binding| binding.action().partial_eq(action.as_ref()))
                     .map(|binding| binding.keystrokes());
 
@@ -343,7 +340,7 @@ impl MacPlatform {
                 let submenu = NSMenu::new(nil).autorelease();
                 submenu.setDelegate_(delegate);
                 for item in items {
-                    submenu.addItem_(self.create_menu_item(item, delegate, actions, dispatch_tree));
+                    submenu.addItem_(self.create_menu_item(item, delegate, actions, keymap));
                 }
                 item.setSubmenu_(submenu);
                 item.setTitle_(ns_string(name));
@@ -691,12 +688,12 @@ impl Platform for MacPlatform {
         }
     }
 
-    fn set_menus(&self, menus: Vec<Menu>, dispatch_tree: Option<&DispatchTree>) {
+    fn set_menus(&self, menus: Vec<Menu>, keymap: &Keymap) {
         unsafe {
             let app: id = msg_send![APP_CLASS, sharedApplication];
             let mut state = self.0.lock();
             let actions = &mut state.menu_actions;
-            app.setMainMenu_(self.create_menu_bar(menus, app.delegate(), actions, dispatch_tree));
+            app.setMainMenu_(self.create_menu_bar(menus, app.delegate(), actions, keymap));
         }
     }
 
diff --git a/crates/gpui2/src/platform/test/platform.rs b/crates/gpui2/src/platform/test/platform.rs
index c76796b5225f9e67ac51fe0898ffef975fc02cad..10fd9f0ff38e7abb57a11d201c9745371cef3f49 100644
--- a/crates/gpui2/src/platform/test/platform.rs
+++ b/crates/gpui2/src/platform/test/platform.rs
@@ -1,7 +1,6 @@
 use crate::{
-    AnyWindowHandle, BackgroundExecutor, ClipboardItem, CursorStyle, DispatchTree, DisplayId,
-    ForegroundExecutor, Platform, PlatformDisplay, PlatformTextSystem, TestDisplay, TestWindow,
-    WindowOptions,
+    AnyWindowHandle, BackgroundExecutor, ClipboardItem, CursorStyle, DisplayId, ForegroundExecutor,
+    Keymap, Platform, PlatformDisplay, PlatformTextSystem, TestDisplay, TestWindow, WindowOptions,
 };
 use anyhow::{anyhow, Result};
 use collections::VecDeque;
@@ -213,7 +212,7 @@ impl Platform for TestPlatform {
         unimplemented!()
     }
 
-    fn set_menus(&self, _menus: Vec<crate::Menu>, _dispatch_tree: Option<&DispatchTree>) {
+    fn set_menus(&self, _menus: Vec<crate::Menu>, _keymap: &Keymap) {
         unimplemented!()
     }