diff --git a/src/main/kotlin/app/termora/keyboardinteractive/KeyboardInteractiveDialog.kt b/src/main/kotlin/app/termora/keyboardinteractive/KeyboardInteractiveDialog.kt
index 9f4b975..f4f91ba 100644
--- a/src/main/kotlin/app/termora/keyboardinteractive/KeyboardInteractiveDialog.kt
+++ b/src/main/kotlin/app/termora/keyboardinteractive/KeyboardInteractiveDialog.kt
@@ -27,12 +27,14 @@ class KeyboardInteractiveDialog(
         isModal = true
         isResizable = true
         controlsVisible = false
-        title = I18n.getString("termora.new-host.title")
 
         init()
         pack()
         size = Dimension(max(300, size.width), size.height)
 
+        // fix https://github.com/TermoraDev/termora/issues/1311
+        pack()
+
         setLocationRelativeTo(null)
 
     }
diff --git a/src/main/kotlin/app/termora/keyboardinteractive/TerminalUserInteraction.kt b/src/main/kotlin/app/termora/keyboardinteractive/TerminalUserInteraction.kt
index d8a4f40..4a0f5ec 100644
--- a/src/main/kotlin/app/termora/keyboardinteractive/TerminalUserInteraction.kt
+++ b/src/main/kotlin/app/termora/keyboardinteractive/TerminalUserInteraction.kt
@@ -30,6 +30,7 @@ class TerminalUserInteraction(
                 )
                 dialog.setLocationRelativeTo(owner)
                 dialog.title = instruction ?: name ?: "OTP"
+                dialog.title = StringUtils.defaultIfBlank(dialog.title, "OTP")
                 passwords[i] = dialog.getText()
                 if (passwords[i].isBlank()) {
                     break