diff --git a/src/io/github/sspanak/tt9/ime/TraditionalT9.java b/src/io/github/sspanak/tt9/ime/TraditionalT9.java
index 89af5197..e3c04132 100644
--- a/src/io/github/sspanak/tt9/ime/TraditionalT9.java
+++ b/src/io/github/sspanak/tt9/ime/TraditionalT9.java
@@ -283,7 +283,16 @@ public class TraditionalT9 extends KeyPadHandler {
 
 
 	protected boolean onKeyNextLanguage() {
-		return nextLang();
+		if (nextLang()) {
+			commitCurrentSuggestion(false);
+			mInputMode.reset();
+			resetKeyRepeat();
+			clearSuggestions();
+
+			return true;
+		}
+
+		return false;
 	}
 
 
@@ -497,8 +506,6 @@ public class TraditionalT9 extends KeyPadHandler {
 			return false;
 		}
 
-		clearSuggestions();
-
 		// select the next language
 		int previousLangId = mEnabledLanguages.indexOf(mLanguage.getId());
 		int nextLangId = previousLangId == -1 ? 0 : (previousLangId + 1) % mEnabledLanguages.size();