diff --git a/src/data/core/vnotex.json b/src/data/core/vnotex.json
index 0ad9f067..431f4c77 100644
--- a/src/data/core/vnotex.json
+++ b/src/data/core/vnotex.json
@@ -6,7 +6,7 @@
         "version" : "3.11.0"
     },
     "core" : {
-        "theme" : "pure",
+        "theme" : "moonlight",
         "locale" : "",
         "shortcuts" : {
             "FullScreen" : "F11",
diff --git a/src/widgets/dockwidgethelper.cpp b/src/widgets/dockwidgethelper.cpp
index 31d500a6..699823a7 100644
--- a/src/widgets/dockwidgethelper.cpp
+++ b/src/widgets/dockwidgethelper.cpp
@@ -243,6 +243,8 @@ void DockWidgetHelper::activateDock(DockIndex p_dockIndex)
 
 void DockWidgetHelper::activateDock(QDockWidget *p_dock)
 {
+    bool needUpdateTabBar = !p_dock->isVisible();
+
     p_dock->show();
     Q_FOREACH(QTabBar* tabBar, m_mainWindow->findChildren<QTabBar*>(QString(), Qt::FindDirectChildrenOnly)) {
         bool found = false;
@@ -258,7 +260,12 @@ void DockWidgetHelper::activateDock(QDockWidget *p_dock)
             break;
         }
     }
+
     p_dock->setFocus();
+
+    if (needUpdateTabBar) {
+        updateDockWidgetTabBar();
+    }
 }
 
 const QVector<QDockWidget *> &DockWidgetHelper::getDocks() const