diff --git a/src/resources/themes/v_moonlight/v_moonlight.qss b/src/resources/themes/v_moonlight/v_moonlight.qss
index 5d25d47a..9c1641e3 100644
--- a/src/resources/themes/v_moonlight/v_moonlight.qss
+++ b/src/resources/themes/v_moonlight/v_moonlight.qss
@@ -739,7 +739,7 @@ QTabBar::tab {
     border: none;
     border-top: 2px solid transparent;
     border-right: 1px solid @tabbar_border;
-    padding: 2px;
+    padding: 2px 0px 2px 0px;
 }
 
 QTabBar::tab:selected {
diff --git a/src/resources/themes/v_pure/v_pure.qss b/src/resources/themes/v_pure/v_pure.qss
index 273a525a..2b0d6bd2 100644
--- a/src/resources/themes/v_pure/v_pure.qss
+++ b/src/resources/themes/v_pure/v_pure.qss
@@ -743,7 +743,7 @@ QTabBar::tab {
     border: none;
     border-top: 2px solid transparent;
     border-right: 1px solid @tabbar_border;
-    padding: 2px;
+    padding: 2px 0px 2px 0px;
 }
 
 QTabBar::tab:selected {
diff --git a/src/resources/themes/v_white/v_white.qss b/src/resources/themes/v_white/v_white.qss
index 64cdb792..b37f7e25 100644
--- a/src/resources/themes/v_white/v_white.qss
+++ b/src/resources/themes/v_white/v_white.qss
@@ -628,7 +628,7 @@ QTabBar::tab {
     background: @tabbar_bg;
     border: none;
     border-right: 1px solid @tabbar_border;
-    padding: 2px;
+    padding: 2px 0px 2px 0px;
 }
 
 QTabBar::tab:selected {
diff --git a/src/veditwindow.cpp b/src/veditwindow.cpp
index 08be256d..730d6177 100644
--- a/src/veditwindow.cpp
+++ b/src/veditwindow.cpp
@@ -1027,10 +1027,16 @@ bool VEditWindow::showOpenedFileList()
 
 bool VEditWindow::activateTab(int p_sequence)
 {
-    if (p_sequence < c_tabSequenceBase || p_sequence >= (c_tabSequenceBase + count())) {
+    if (p_sequence < c_tabSequenceBase
+        || p_sequence >= (c_tabSequenceBase + count())) {
         return false;
     }
-    setCurrentIndex(p_sequence - c_tabSequenceBase);
+
+    int idx = p_sequence - c_tabSequenceBase;
+    setCurrentIndex(idx);
+    // Always need to focus to this tab to meet the requirement of Captain mode.
+    getTab(idx)->focusTab();
+
     return true;
 }
 
diff --git a/src/veditwindow.h b/src/veditwindow.h
index 0dc5de2c..ceb7070a 100644
--- a/src/veditwindow.h
+++ b/src/veditwindow.h
@@ -66,7 +66,9 @@ public:
     void focusNextTab(bool p_right);
     // Return true if the file list is shown.
     bool showOpenedFileList();
+
     bool activateTab(int p_sequence);
+
     // Switch to previous activated tab.
     bool alternateTab();