diff --git a/src/io/github/sspanak/tt9/ime/TraditionalT9.java b/src/io/github/sspanak/tt9/ime/TraditionalT9.java
index 6ca4fb6e..bc398204 100644
--- a/src/io/github/sspanak/tt9/ime/TraditionalT9.java
+++ b/src/io/github/sspanak/tt9/ime/TraditionalT9.java
@@ -309,15 +309,11 @@ public class TraditionalT9 extends KeyPadHandler {
 	public boolean onOK() {
 		cancelAutoAccept();
 
-		if (!isInputViewShown() && !textField.isThereText()) {
-			forceShowWindowIfHidden();
-			return true;
-		} else if (isSuggestionViewHidden()) {
+		if (isSuggestionViewHidden()) {
 			return performOKAction();
+		} else {
+			acceptCurrentSuggestion(KeyEvent.KEYCODE_ENTER);
 		}
-
-		acceptCurrentSuggestion(KeyEvent.KEYCODE_ENTER);
-
 		return true;
 	}