diff --git a/app/src/main/java/io/github/sspanak/tt9/ime/HotkeyHandler.java b/app/src/main/java/io/github/sspanak/tt9/ime/HotkeyHandler.java
index 22e4a050..ba39ceb4 100644
--- a/app/src/main/java/io/github/sspanak/tt9/ime/HotkeyHandler.java
+++ b/app/src/main/java/io/github/sspanak/tt9/ime/HotkeyHandler.java
@@ -223,7 +223,7 @@ public abstract class HotkeyHandler extends TypingHandler {
 		setStatusText(mInputMode.toString());
 		renderMainView();
 		if (!suggestionOps.isEmpty() || settings.isMainLayoutStealth()) {
-			UI.toastShortSingle(this, mLanguage.getClass().getSimpleName(), mLanguage.getName());
+			UI.toastShortSingle(this, mInputMode.getClass().getSimpleName(), mInputMode.toString());
 		}
 
 		if (mInputMode instanceof ModePredictive) {
@@ -248,6 +248,10 @@ public abstract class HotkeyHandler extends TypingHandler {
 		nextInputMode();
 		renderMainView();
 
+		if (settings.isMainLayoutStealth()) {
+			UI.toastShortSingle(this, mInputMode.getClass().getSimpleName(), mInputMode.toString());
+		}
+
 		forceShowWindowIfHidden();
 		return true;
 	}