diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/CommandHandler.java b/app/src/main/java/io/github/sspanak/tt9/ime/CommandHandler.java
index 9ccba545..c4001796 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ime/CommandHandler.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ime/CommandHandler.java
@@ -70,12 +70,16 @@ abstract public class CommandHandler extends TextEditingHandler {
 	protected void resetStatus() {
 		if (mainView.isCommandPaletteShown()) {
 			statusBar.setText(R.string.commands_select_command);
-		} if (mainView.isTextEditingPaletteShown()) {
+			return;
+		}
+
+		if (mainView.isTextEditingPaletteShown()) {
 			String preview = Clipboard.getPreview(this);
 			statusBar.setText(preview.isEmpty() ? getString(R.string.commands_select_command) : "[ \"" + preview + "\" ]");
-		} else {
-			statusBar.setText(mInputMode);
+			return;
 		}
+
+		statusBar.setText(mInputMode);
 	}