diff --git a/src/main/kotlin/com/vk/admstorm/ssh/EnterPasswordDialog.kt b/src/main/kotlin/com/vk/admstorm/ssh/EnterPasswordDialog.kt
index 115520f5..bb8ef2c6 100644
--- a/src/main/kotlin/com/vk/admstorm/ssh/EnterPasswordDialog.kt
+++ b/src/main/kotlin/com/vk/admstorm/ssh/EnterPasswordDialog.kt
@@ -43,9 +43,8 @@ class EnterPasswordDialog(project: Project) : DialogWrapper(project, true, IdeMo
         init()
 
         myPasswordInput.addKeyListener(object : KeyAdapter() {
-            override fun keyTyped(e: KeyEvent) {
-                val char = e.keyChar
-                if (!char.isLetterOrDigit() || char in 'А'..'я') {
+            override fun keyReleased(e: KeyEvent) {
+                if (getPassword().any { it in 'А'..'я' || it == 'ё' || it == 'Ё' }) {
                     warningLabel.text = "PIN should contain only English characters and numbers!"
                 } else {
                     warningLabel.text = ""