diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/TraditionalT9.java b/app/src/main/java/io/github/sspanak/tt9/ime/TraditionalT9.java
index ebfd79a9..0a5ee2a3 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ime/TraditionalT9.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ime/TraditionalT9.java
@@ -423,7 +423,10 @@ public class TraditionalT9 extends KeyPadHandler {
 			return true;
 		}
 
-		return false;
+		acceptIncompleteSuggestion();
+		resetKeyRepeat();
+
+		return true;
 	}
 
 
diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModePredictive.java b/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModePredictive.java
index d4ad90a5..38cd09a2 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModePredictive.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ime/modes/ModePredictive.java
@@ -173,6 +173,10 @@ public class ModePredictive extends InputMode {
 	@Override
 	public boolean setWordStem(String newStem, boolean exact) {
 		if (newStem == null || newStem.isEmpty()) {
+			if (stem.isEmpty()) {
+				return false;
+			}
+
 			isStemFuzzy = false;
 			stem = "";