diff --git a/crates/gpui/src/platform/linux/x11/client.rs b/crates/gpui/src/platform/linux/x11/client.rs
index 1bd7d9a305ca714193d923f74bb5f16a6bbcc166..4a4521b35d05cac960442c394ae01df831572660 100644
--- a/crates/gpui/src/platform/linux/x11/client.rs
+++ b/crates/gpui/src/platform/linux/x11/client.rs
@@ -186,6 +186,8 @@ pub struct X11ClientState {
     pub(crate) ximc: Option<X11rbClient<Rc<XCBConnection>>>,
     pub(crate) xim_handler: Option<XimHandler>,
     pub modifiers: Modifiers,
+    // TODO: Can the other updates to `modifiers` be removed so that this is unnecessary?
+    pub last_modifiers_changed_event: Modifiers,
 
     pub(crate) compose_state: Option<xkbc::compose::State>,
     pub(crate) pre_edit_text: Option<String>,
@@ -434,6 +436,7 @@ impl X11Client {
 
         X11Client(Rc::new(RefCell::new(X11ClientState {
             modifiers: Modifiers::default(),
+            last_modifiers_changed_event: Modifiers::default(),
             event_loop: Some(event_loop),
             loop_handle: handle,
             common,
@@ -867,11 +870,12 @@ impl X11Client {
                 }
 
                 let modifiers = Modifiers::from_xkb(&state.xkb);
-                if state.modifiers == modifiers {
+                if state.last_modifiers_changed_event == modifiers {
                     drop(state);
                 } else {
                     let focused_window_id = state.keyboard_focused_window?;
                     state.modifiers = modifiers;
+                    state.last_modifiers_changed_event = modifiers;
                     drop(state);
 
                     let focused_window = self.get_window(focused_window_id)?;