diff --git a/include/sway/input/keyboard.h b/include/sway/input/keyboard.h
index 2c61e5a75..e0de1a0dc 100644
--- a/include/sway/input/keyboard.h
+++ b/include/sway/input/keyboard.h
@@ -65,6 +65,7 @@ struct sway_keyboard {
 	struct sway_shortcut_state state_keycodes;
 	struct sway_shortcut_state state_pressed_sent;
 	struct sway_binding *held_binding;
+	uint32_t held_keycode;
 
 	struct wl_event_source *key_repeat_source;
 	struct sway_binding *repeat_binding;
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index 1aa306559..13f2bd865 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -441,17 +441,21 @@ static void handle_key_event(struct sway_keyboard *keyboard,
 			shortcuts_inhibited, device_identifier,
 			exact_identifier, keyboard->effective_layout);
 
-	// Execute stored release binding once no longer active
-	if (keyboard->held_binding && binding_released != keyboard->held_binding &&
+	// Execute stored release binding when the key is released
+	if (keyboard->held_binding && 
+			keyinfo.keycode == keyboard->held_keycode &&
 			event->state == WL_KEYBOARD_KEY_STATE_RELEASED) {
 		seat_execute_command(seat, keyboard->held_binding);
 		handled = true;
 	}
-	if (binding_released != keyboard->held_binding) {
+	if (handled ||
+			(binding_released && binding_released != keyboard->held_binding)) {
 		keyboard->held_binding = NULL;
+		keyboard->held_keycode = 0;
 	}
 	if (binding_released && event->state == WL_KEYBOARD_KEY_STATE_PRESSED) {
 		keyboard->held_binding = binding_released;
+		keyboard->held_keycode = keyinfo.keycode;
 	}
 
 	// Identify and execute active pressed binding