diff --git a/lib/codemirror.js b/lib/codemirror.js
index 8246529c6c19fb0d9c3a984a88f9351a9d82e5ba..22082263b8f382b6e4aeebcfcb870b6802d59816 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1398,7 +1398,7 @@
       // will be the case when there is a lot of text in the textarea,
       // in which case reading its value would be expensive.
       if (this.contextMenuPending || !cm.state.focused ||
-          (hasSelection(input) && !prevInput) ||
+          (hasSelection(input) && !prevInput && !this.composing) ||
           isReadOnly(cm) || cm.options.disableInput || cm.state.keySeq)
         return false;