diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45972b2..c8d29ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,7 @@ Released on FIXME: ??
 - **Start termscp from configuration**: Start termscp with `-c` or `--config` to start termscp from configuration page
 - Bugfix:
   - Fixed broken input cursor when typing UTF8 characters (tui-realm 0.3.2)
+  - Fixed save bookmark dialog: you could switch out from dialog with `<TAB>`
 - Dependencies:
   - Added `open 1.7.0`
   - Updated `rand` to `0.8.4`
diff --git a/src/ui/activities/auth/update.rs b/src/ui/activities/auth/update.rs
index 7173850..be6ad54 100644
--- a/src/ui/activities/auth/update.rs
+++ b/src/ui/activities/auth/update.rs
@@ -297,6 +297,7 @@ impl Update for AuthActivity {
                     self.umount_bookmark_save_dialog();
                     None
                 }
+                (COMPONENT_INPUT_BOOKMARK_NAME, _) | (COMPONENT_RADIO_BOOKMARK_SAVE_PWD, _) => None,
                 // Quit dialog
                 (COMPONENT_RADIO_QUIT, Msg::OnSubmit(Payload::One(Value::Usize(choice)))) => {
                     // If choice is 0, quit termscp