diff --git a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
index 7e98241ad7d..07e64ae320b 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
@@ -129,7 +129,7 @@ boolean saveAs(Path file, SaveDatabaseMode mode) {
             // we managed to successfully save the file
             // thus, we can store the store the path into the context
             context.setDatabasePath(file);
-            // FIXME: We need to refresh the tab titles
+            libraryTab.updateTabTitle(false);
 
             // Reinstall AutosaveManager and BackupManager for the new file name
             libraryTab.resetChangeMonitorAndChangePane();
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
index a089aadf723..9fee4372776 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
@@ -66,7 +66,7 @@ public void listen(ConnectionLostEvent connectionLostEvent) {
                 new SharedDatabaseLoginDialogView(jabRefFrame).showAndWait();
             } else if (answer.get().equals(workOffline)) {
                 connectionLostEvent.getBibDatabaseContext().convertToLocalDatabase();
-                // jabRefFrame.refreshWindowAndTabTitles();
+                jabRefFrame.getLibraryTabs().forEach(tab -> tab.updateTabTitle(tab.isModified()));
                 jabRefFrame.getDialogService().notify(Localization.lang("Working offline."));
             }
         } else {