diff --git a/src/lib/app/mainapplication.cpp b/src/lib/app/mainapplication.cpp
index 17db56368..11d7e8605 100644
--- a/src/lib/app/mainapplication.cpp
+++ b/src/lib/app/mainapplication.cpp
@@ -304,10 +304,10 @@ MainApplication::MainApplication(int &argc, char** argv)
             m_restoreManager = new RestoreManager();
             if (!m_restoreManager->isValid()) {
                 destroyRestoreManager();
+            } else {
+                // Pinned tabs are saved into session.dat, so remove the old saved pinned tabs
+                QFile::remove(DataPaths::currentProfilePath() + QL1S("/pinnedtabs.dat"));
             }
-
-            // Pinned tabs are saved into session.dat, so remove the old saved pinned tabs
-            QFile::remove(DataPaths::currentProfilePath() + QL1S("/pinnedtabs.dat"));
         }
     }
 
diff --git a/src/lib/webtab/webtab.cpp b/src/lib/webtab/webtab.cpp
index 2c85d7170..fbc8c7c1a 100644
--- a/src/lib/webtab/webtab.cpp
+++ b/src/lib/webtab/webtab.cpp
@@ -287,7 +287,9 @@ void WebTab::restoreTab(const WebTab::SavedTab &tab)
 {
     Q_ASSERT(m_tabBar);
 
-    if (!tab.isPinned && qzSettings->loadTabsOnActivation) {
+    m_isPinned = tab.isPinned;
+
+    if (!m_isPinned && qzSettings->loadTabsOnActivation) {
         m_savedTab = tab;
         int index = tabIndex();
 
@@ -322,7 +324,6 @@ void WebTab::p_restoreTab(const QUrl &url, const QByteArray &history)
 void WebTab::p_restoreTab(const WebTab::SavedTab &tab)
 {
     p_restoreTab(tab.url, tab.history);
-    m_isPinned = tab.isPinned;
 }
 
 QPixmap WebTab::renderTabPreview()