diff --git a/src/InputController.mm b/src/InputController.mm
index 4f6ba35..04c784a 100644
--- a/src/InputController.mm
+++ b/src/InputController.mm
@@ -87,13 +87,9 @@ - (BOOL)onKeyEvent:(NSEvent *)event client:(id)sender {
     }
 
     if (keyCode == KEY_ESC) {
-        if (hasBufferedText) {
-            [self cancelComposition];
-            [self setComposedBuffer:@""];
-            [self setOriginalBuffer:@""];
-            [self commitComposition:sender];
-        }
-        return NO;
+        [self cancelComposition];
+        [self commitComposition:sender];
+        return YES;
     }
 
     char ch = [characters characterAtIndex:0];