diff --git a/src/ui/windows/chat_tab.cpp b/src/ui/windows/chat_tab.cpp
index 7e26819..63d6360 100644
--- a/src/ui/windows/chat_tab.cpp
+++ b/src/ui/windows/chat_tab.cpp
@@ -1118,12 +1118,12 @@ void RenderChatTab(App* app)
                             if (nm != book.entries()[bookIdx].label) {   // skip a no-op rewrite/save
                                 data::AddressBookEntry e = book.entries()[bookIdx];
                                 e.label = nm;                   // keep address/notes/scope/avatar
-                                book.updateEntry(static_cast<std::size_t>(bookIdx), e);
-                                book.save();
-                                Notifications::instance().success(TR("chat_renamed"));
+                                if (book.updateEntry(static_cast<std::size_t>(bookIdx), e))   // mutator already saves
+                                    Notifications::instance().success(TR("chat_renamed"));
+                                else
+                                    Notifications::instance().error(TR("address_book_update_failed"));
                             }
-                        } else if (book.addEntry(data::AddressBookEntry(nm, sel->peerZaddr))) {
-                            book.save();
+                        } else if (book.addEntry(data::AddressBookEntry(nm, sel->peerZaddr))) {   // mutator already saves
                             Notifications::instance().success(TR("chat_contact_added"));
                         } else {
                             Notifications::instance().error(TR("address_book_exists"));