diff --git a/browser/finder/index.js b/browser/finder/index.js
index e65e1a6b..dc3e9342 100644
--- a/browser/finder/index.js
+++ b/browser/finder/index.js
@@ -121,7 +121,7 @@ class FinderMain extends React.Component {
     let { articles, activeArticle, status, dispatch } = this.props
     let saveToClipboard = () => this.saveToClipboard()
     return (
-      <div onClick={e => this.handleClick(e)} className='Finder'>
+      <div className='Finder'>
         <FinderInput
           handleSearchChange={e => this.handleSearchChange(e)}
           ref='finderInput'
@@ -243,7 +243,7 @@ var Finder = connect(remap)(FinderMain)
 var store = createStore(reducer)
 
 function refreshData () {
-  let data = dataStore.getData()
+  let data = dataStore.getData(true)
   store.dispatch(actions.refreshData(data))
 }
 
diff --git a/browser/lib/dataStore.js b/browser/lib/dataStore.js
index 1784cc81..52b2618c 100644
--- a/browser/lib/dataStore.js
+++ b/browser/lib/dataStore.js
@@ -71,19 +71,8 @@ export function saveUser (repoName, user) {
 export function init () {
   // set repositories info
   getRepositories()
-
-  data = getData()
-
+  data = jetpack.read(getLocalPath(), 'json')
   if (data == null) {
-    // for 0.4.1 -> 0.4.2
-    if (localStorage.getItem('local') != null) {
-      data = JSON.parse(localStorage.getItem('local'))
-      jetpack.write(getLocalPath(), data)
-      localStorage.removeItem('local')
-      console.log('update 0.4.1 => 0.4.2')
-      return
-    }
-
     let defaultFolder = {
       name: 'default',
       key: keygen()
@@ -108,14 +97,11 @@ export function init () {
   }
 }
 
-export function getData () {
-  if (data == null) {
+export function getData (forceRead) {
+  if (forceRead) {
     try {
       data = jetpack.read(getLocalPath(), 'json')
-
-    } catch (e) {
-      return null
-    }
+    } catch (e) {}
   }
   return data
 }
@@ -140,7 +126,7 @@ function queueSave () {
     if (timer) {
       clearTimeout(timer)
     }
-    timer = setTimeout(saveData, 3000)
+    timer = setTimeout(saveData, 500)
   } else {
     saveAgain = true
   }
@@ -160,21 +146,11 @@ export function setFolders (folders) {
   queueSave()
 }
 
-function isFinderCalled () {
-  var argv = process.argv.slice(1)
-  return argv.some(arg => arg.match(/--finder/))
+export default {
+  getUser,
+  saveUser,
+  init,
+  getData,
+  setArticles,
+  setFolders
 }
-
-export default (function () {
-  if (!isFinderCalled()) {
-    init()
-  }
-  return {
-    getUser,
-    saveUser,
-    init,
-    getData,
-    setArticles,
-    setFolders
-  }
-})()
diff --git a/browser/main/reducer.js b/browser/main/reducer.js
index 91a8343d..8f7afd10 100644
--- a/browser/main/reducer.js
+++ b/browser/main/reducer.js
@@ -36,6 +36,7 @@ const initialStatus = {
   isTutorialOpen: false
 }
 
+dataStore.init()
 let data = dataStore.getData()
 let initialArticles = {
   data: data && data.articles ? data.articles : [],