diff --git a/src/kiwixapp.cpp b/src/kiwixapp.cpp
index 1e1e574..83dbab4 100644
--- a/src/kiwixapp.cpp
+++ b/src/kiwixapp.cpp
@@ -207,7 +207,10 @@ void KiwixApp::restoreTabs()
     {
       for (const auto &zimUrl : tabsToOpen)
       {
-        openUrl(QUrl(zimUrl));
+        if (zimUrl.isEmpty())
+          getTabWidget()->createNewTab(true, true);
+        else
+          openUrl(QUrl(zimUrl));
       }
     }
 }
diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index cbc8846..0fe83d6 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -163,6 +163,7 @@ ZimView* TabBar::createNewTab(bool setCurrent, bool nextToCurrentTab)
     connect(tab, &ZimView::webActionEnabledChanged,
             this, &TabBar::onWebviewHistoryActionChanged);
 
+    KiwixApp::instance()->saveListOfOpenTabs();
     return tab;
 }