diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f0d5c7..89fb87e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@ Released on FIXME: ??
     - when you change the protocol in the authentication form and the current port is standard (`< 1024`), the port will be automatically changed to default value for the selected protocol (e.g. current port: `123`, protocol is changes to `FTP`, port becomes `21`)
 - Bugfix:
   - Fixed wrong text wrap in log box
+  - Fixed empty bookmark name causing termscp to crash
   - Fixed error message not being shown after an upload failure
   - Fixed default protocol not being loaded from config
   - [Issue 23](https://github.com/veeso/termscp/issues/23): Remove created file if transfer failed or was abrupted
diff --git a/src/ui/activities/auth/update.rs b/src/ui/activities/auth/update.rs
index 4afe7de..cc8f17d 100644
--- a/src/ui/activities/auth/update.rs
+++ b/src/ui/activities/auth/update.rs
@@ -271,7 +271,9 @@ impl AuthActivity {
                         Some(Payload::One(Value::Usize(0)))
                     );
                     // Save bookmark
-                    self.save_bookmark(bookmark_name, save_pwd);
+                    if !bookmark_name.is_empty() {
+                        self.save_bookmark(bookmark_name, save_pwd);
+                    }
                     // Umount popup
                     self.umount_bookmark_save_dialog();
                     // Reload bookmarks