diff --git a/crates/settings_ui/src/keybindings.rs b/crates/settings_ui/src/keybindings.rs
index 5f940e8a25cc784a5ad0bd529e213c2e0b69a03d..9e885f69f6efde4ff7636b1d682a19c515a09bc6 100644
--- a/crates/settings_ui/src/keybindings.rs
+++ b/crates/settings_ui/src/keybindings.rs
@@ -2784,6 +2784,7 @@ impl KeystrokeInput {
         else {
             log::trace!("No keybinding to stop recording keystrokes in keystroke input");
             self.close_keystrokes.take();
+            self.close_keystrokes_start.take();
             return CloseKeystrokeResult::None;
         };
         let action_keystrokes = keybind_for_close_action.keystrokes();
@@ -2976,7 +2977,9 @@ impl KeystrokeInput {
             return;
         }
         window.focus(&self.outer_focus_handle);
-        if let Some(close_keystrokes_start) = self.close_keystrokes_start.take() {
+        if let Some(close_keystrokes_start) = self.close_keystrokes_start.take()
+            && close_keystrokes_start < self.keystrokes.len()
+        {
             self.keystrokes.drain(close_keystrokes_start..);
         }
         self.close_keystrokes.take();