diff --git a/Telegram/Resources/lang.strings b/Telegram/Resources/lang.strings
index 4faf710ac..3cd50617c 100644
--- a/Telegram/Resources/lang.strings
+++ b/Telegram/Resources/lang.strings
@@ -302,6 +302,7 @@ Copyright (c) 2014-2015 John Preston, https://desktop.telegram.org
 "lng_passcode_enter" = "Enter your local passcode";
 "lng_passcode_submit" = "Submit";
 "lng_passcode_logout" = "Log out";
+"lng_passcode_need_unblock" = "You need to unlock me first.";
 
 "lng_cloud_password_waiting" = "Confirmation link sent to {email}..";
 "lng_cloud_password_change" = "Change cloud password";
diff --git a/Telegram/SourceFiles/window.cpp b/Telegram/SourceFiles/window.cpp
index 9bb6ceddb..f2f720f70 100644
--- a/Telegram/SourceFiles/window.cpp
+++ b/Telegram/SourceFiles/window.cpp
@@ -1182,6 +1182,11 @@ void Window::toggleTray(QSystemTrayIcon::ActivationReason reason) {
 }
 
 void Window::toggleDisplayNotifyFromTray() {
+	if (App::passcoded()) {
+		if (!isActive()) showFromTray();
+		showLayer(new InformBox(lang(lng_passcode_need_unblock)));
+		return;
+	}
 	cSetDesktopNotify(!cDesktopNotify());
 	if (settings) {
 		settings->updateDisplayNotify();