diff --git a/app/src/main/java/net/mezimmah/wkt9/inputhandler/WordInputHandler.kt b/app/src/main/java/net/mezimmah/wkt9/inputhandler/WordInputHandler.kt
index 051c7a5..8ce36d8 100644
--- a/app/src/main/java/net/mezimmah/wkt9/inputhandler/WordInputHandler.kt
+++ b/app/src/main/java/net/mezimmah/wkt9/inputhandler/WordInputHandler.kt
@@ -158,6 +158,8 @@ class WordInputHandler(
     }
 
     private fun inputMode(key: Key) {
+        if (codeword.isNotEmpty()) wkt9.onCommit()
+
         if (key == Key.B4) wkt9.onSwitchInputHandler(InputMode.Number)
         else wkt9.onSwitchInputHandler(InputMode.Letter)
     }