diff --git a/src/components/FileExplorer.js b/src/components/FileExplorer.js
index 240de61..568a436 100644
--- a/src/components/FileExplorer.js
+++ b/src/components/FileExplorer.js
@@ -37,8 +37,9 @@ export default class FileExplorer extends React.Component {
   }
 
   componentWillMount() {
-    const { init } = this.props
+    const { init, setUpTree, treeData } = this.props
     init()
+    setUpTree(treeData)
   }
 
   componentDidMount() {
@@ -48,8 +49,8 @@ export default class FileExplorer extends React.Component {
 
   componentWillReceiveProps(nextProps) {
     if (nextProps.treeData !== this.props.treeData) {
-      const { init } = nextProps
-      init()
+      const { setUpTree } = nextProps
+      setUpTree()
     }
   }
 
diff --git a/src/driver/core/FileExplorer.js b/src/driver/core/FileExplorer.js
index 4a59a03..5c4294d 100644
--- a/src/driver/core/FileExplorer.js
+++ b/src/driver/core/FileExplorer.js
@@ -20,11 +20,12 @@ function getVisibleParentNode(nodes, focusedNode, depths) {
 const tasksAfterRender = []
 const visibleNodesGenerator = new VisibleNodesGenerator()
 
-const init = dispatch => () => dispatch(async (state, { treeData, metaData, compressSingletonFolder }) => {
-  if (!treeData) {
-    dispatch(setStateText, 'Fetching Tree Data...')
-    return
-  }
+const init = dispatch => () => dispatch(async () => {
+  dispatch(setStateText, 'Fetching File List...')
+})
+
+const setUpTree = dispatch => () => dispatch(async (state, { treeData, metaData, compressSingletonFolder }) => {
+  if (!treeData) return
   dispatch(setStateText, 'Rendering File List...')
   const { root } = treeParser.parse(treeData, metaData)
   visibleNodesGenerator.setCompress(compressSingletonFolder)
@@ -225,6 +226,7 @@ const updateVisibleNodes = dispatch => () => {
 
 export default {
   init,
+  setUpTree,
   execAfterRender,
   setStateText,
   handleKeyDown,