diff --git a/src/main.cpp b/src/main.cpp
index 41d0e590..dced62e3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -164,9 +164,9 @@ int main(int argc, char *argv[])
 
     w.show();
 
-    w.openFiles(filePaths);
-
     w.openStartupPages();
 
+    w.openFiles(filePaths);
+
     return app.exec();
 }
diff --git a/src/veditarea.cpp b/src/veditarea.cpp
index da46c913..31474e19 100644
--- a/src/veditarea.cpp
+++ b/src/veditarea.cpp
@@ -932,4 +932,3 @@ void VEditArea::removeSplitByCaptain(void *p_target, void *p_data)
     VEditArea *obj = static_cast<VEditArea *>(p_target);
     obj->removeCurrentWindow();
 }
-
diff --git a/src/veditwindow.cpp b/src/veditwindow.cpp
index 782d5696..bc4a9e3a 100644
--- a/src/veditwindow.cpp
+++ b/src/veditwindow.cpp
@@ -478,6 +478,8 @@ void VEditWindow::updateTabStatus(int p_index)
     emit tabStatusUpdated(tab->fetchTabInfo());
     emit outlineChanged(tab->getOutline());
     emit currentHeaderChanged(tab->getCurrentHeader());
+
+    updateTabInfo(p_index);
 }
 
 void VEditWindow::updateTabInfo(int p_index)
diff --git a/src/vfilelist.h b/src/vfilelist.h
index ac24d9eb..6fa0258f 100644
--- a/src/vfilelist.h
+++ b/src/vfilelist.h
@@ -44,7 +44,9 @@ public:
     // Locate @p_file in the list widget.
     bool locateFile(const VNoteFile *p_file);
 
-    inline const VDirectory *currentDirectory() const;
+    const VDirectory *currentDirectory() const;
+
+    QWidget *getContentWidget() const;
 
     // Implementations for VNavigationMode.
     void registerNavigation(QChar p_majorKey) Q_DECL_OVERRIDE;
@@ -199,4 +201,9 @@ inline const VDirectory *VFileList::currentDirectory() const
     return m_directory;
 }
 
+inline QWidget *VFileList::getContentWidget() const
+{
+    return fileList;
+}
+
 #endif // VFILELIST_H
diff --git a/src/vmainwindow.cpp b/src/vmainwindow.cpp
index 51dcf2b3..7126e0f3 100644
--- a/src/vmainwindow.cpp
+++ b/src/vmainwindow.cpp
@@ -169,6 +169,7 @@ void VMainWindow::setupUI()
     m_mainSplitter->setObjectName("MainSplitter");
     m_mainSplitter->addWidget(directoryPanel);
     m_mainSplitter->addWidget(m_fileList);
+    setTabOrder(directoryTree, m_fileList->getContentWidget());
     m_mainSplitter->addWidget(editArea);
     m_mainSplitter->setStretchFactor(0, 0);
     m_mainSplitter->setStretchFactor(1, 0);
@@ -283,6 +284,7 @@ QWidget *VMainWindow::setupDirectoryPanel()
 
     connect(directoryTree, &VDirectoryTree::currentDirectoryChanged,
             this, &VMainWindow::handleCurrentDirectoryChanged);
+
     return nbContainer;
 }
 
@@ -1895,6 +1897,9 @@ void VMainWindow::enableCompactMode(bool p_enabled)
 
         m_fileList->show();
     }
+
+    // Set Tab order.
+    setTabOrder(directoryTree, m_fileList->getContentWidget());
 }
 
 void VMainWindow::changePanelView(PanelViewState p_state)