diff --git a/autotests/qztoolstest.cpp b/autotests/qztoolstest.cpp
index 5d705f6c9..923bd86db 100644
--- a/autotests/qztoolstest.cpp
+++ b/autotests/qztoolstest.cpp
@@ -314,6 +314,7 @@ void QzToolsTest::copyRecursivelyTest()
     QFile file(testDir + "-copy/dir1/dir1_2/file1.txt");
     file.open(QFile::ReadOnly);
     QCOMPARE(file.readAll(), QByteArray("test"));
+    file.close();
 
     // Copy to target that already exists
     QCOMPARE(QzTools::copyRecursively(testDir, testDir + "-copy"), false);
diff --git a/src/plugins/VerticalTabs/tabtreeview.cpp b/src/plugins/VerticalTabs/tabtreeview.cpp
index 6cca902fe..42b69f7af 100644
--- a/src/plugins/VerticalTabs/tabtreeview.cpp
+++ b/src/plugins/VerticalTabs/tabtreeview.cpp
@@ -338,14 +338,14 @@ bool TabTreeView::viewportEvent(QEvent *event)
 void TabTreeView::initView()
 {
     // Restore expanded state
-    expandAll();
-    QModelIndex index = model()->index(0, 0);
-    while (index.isValid()) {
-        WebTab *tab = index.data(TabModel::WebTabRole).value<WebTab*>();
-        if (tab) {
-            setExpanded(index, tab->sessionData().value(m_expandedSessionKey, true).toBool());
-        }
-        index = indexBelow(index);
+    for (int i = 0; i < model()->rowCount(); ++i) {
+        const QModelIndex index = model()->index(i, 0);
+        reverseTraverse(index, [this](const QModelIndex &index) {
+            WebTab *tab = index.data(TabModel::WebTabRole).value<WebTab*>();
+            if (tab) {
+                setExpanded(index, tab->sessionData().value(m_expandedSessionKey, true).toBool());
+            }
+        });
     }
 
     m_initializing = false;
diff --git a/src/plugins/VerticalTabs/verticaltabsplugin.cpp b/src/plugins/VerticalTabs/verticaltabsplugin.cpp
index 5c271618e..732092544 100644
--- a/src/plugins/VerticalTabs/verticaltabsplugin.cpp
+++ b/src/plugins/VerticalTabs/verticaltabsplugin.cpp
@@ -71,6 +71,9 @@ void VerticalTabsPlugin::init(InitState state, const QString &settingsPath)
         const auto windows = mApp->windows();
         for (BrowserWindow *window : windows) {
             mainWindowCreated(window);
+            if (window->sideBarManager()->activeSideBar().isEmpty()) {
+                window->sideBarManager()->showSideBar(QSL("VerticalTabs"));
+            }
         }
     }
 }
@@ -187,9 +190,7 @@ QString VerticalTabsPlugin::styleSheet() const
 
 void VerticalTabsPlugin::mainWindowCreated(BrowserWindow *window)
 {
-    if (window->sideBarManager()->activeSideBar().isEmpty()) {
-        window->sideBarManager()->showSideBar(QSL("VerticalTabs"));
-    }
+    Q_UNUSED(window)
     setTabBarVisible(!m_replaceTabBar);
 }