diff --git a/src/cocoa_window.m b/src/cocoa_window.m
index 40d51588..44f33a5e 100644
--- a/src/cocoa_window.m
+++ b/src/cocoa_window.m
@@ -580,7 +580,8 @@ static const NSRange kEmptyRange = { NSNotFound, 0 };
     const int key = translateKey([event keyCode]);
     const int mods = translateFlags([event modifierFlags]);
 
-    _glfwInputKey(window, key, [event keyCode], GLFW_PRESS, mods);
+    if (![self hasMarkedText])
+        _glfwInputKey(window, key, [event keyCode], GLFW_PRESS, mods);
 
     [self interpretKeyEvents:@[event]];
 }