diff --git a/app/src/main/java/com/osfans/trime/ime/keyboard/Event.kt b/app/src/main/java/com/osfans/trime/ime/keyboard/Event.kt
index 728f1da0b7..35e9abfc74 100644
--- a/app/src/main/java/com/osfans/trime/ime/keyboard/Event.kt
+++ b/app/src/main/java/com/osfans/trime/ime/keyboard/Event.kt
@@ -27,7 +27,7 @@ class Event(var s: String) {
     private var states: List<String>? = null
     var command: String = ""
     var option: String = ""
-    var select: String? = null
+    var select: String = ""
     private var toggle: String = ""
     var commit: String = ""
         private set
diff --git a/app/src/main/java/com/osfans/trime/ime/keyboard/KeyboardWindow.kt b/app/src/main/java/com/osfans/trime/ime/keyboard/KeyboardWindow.kt
index c937d55e62..46a6d89dc6 100644
--- a/app/src/main/java/com/osfans/trime/ime/keyboard/KeyboardWindow.kt
+++ b/app/src/main/java/com/osfans/trime/ime/keyboard/KeyboardWindow.kt
@@ -265,7 +265,7 @@ class KeyboardWindow(
                 return
             }
             if (event.code == KeyEvent.KEYCODE_EISU) { // Switch keyboard
-                switchKeyboard(event.select ?: ".default")
+                switchKeyboard(event.select)
             } else {
                 delegate.onEvent(event)
             }
diff --git a/app/src/main/java/com/osfans/trime/ime/text/TextInputManager.kt b/app/src/main/java/com/osfans/trime/ime/text/TextInputManager.kt
index 6ff48f76c1..f19adf45dc 100644
--- a/app/src/main/java/com/osfans/trime/ime/text/TextInputManager.kt
+++ b/app/src/main/java/com/osfans/trime/ime/text/TextInputManager.kt
@@ -225,10 +225,10 @@ class TextInputManager(
             }
             KeyEvent.KEYCODE_LANGUAGE_SWITCH -> { // Switch IME
                 when {
-                    event.select!!.contentEquals(".next") -> {
+                    event.select == ".next" -> {
                         trime.switchToNextIme()
                     }
-                    !event.select.isNullOrEmpty() -> {
+                    event.select.isNotEmpty() -> {
                         trime.switchToPrevIme()
                     }
                     else -> {