diff --git a/package.json b/package.json
index e232af6..72fb076 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,7 @@
     "css-loader": "^0.28.4",
     "del": "^3.0.0",
     "devtron": "^1.4.0",
-    "electron": "4.0.0",
+    "electron": "4.0.2",
     "electron-builder": "^20.38.4",
     "electron-debug": "^1.4.0",
     "electron-devtools-installer": "^2.2.0",
diff --git a/src/renderer/layouts/SettingPage.vue b/src/renderer/layouts/SettingPage.vue
index a1a6bd9..b5a1e0b 100644
--- a/src/renderer/layouts/SettingPage.vue
+++ b/src/renderer/layouts/SettingPage.vue
@@ -64,7 +64,12 @@
         class="main-wrapper"
         :class="{ 'darwin': os === 'darwin' }">
         <transition name="picgo-fade" mode="out-in">
-          <router-view :key="$route.params ? $route.params.type : $route.path"></router-view>
+          <keep-alive>
+            <router-view v-if="$route.meta.keepAlive"></router-view>
+          </keep-alive>
+        </transition>
+        <transition name="picgo-fade" mode="out-in">
+          <router-view :key="$route.path" v-if="!$route.meta.keepAlive"></router-view>
         </transition>
       </el-col>
     </el-row>
@@ -296,7 +301,7 @@ $darwinBg = transparentify(#172426, #000, 0.7)
     opacity 0
   &-enter-active,
   &-leave-active
-    transition opacity 100ms linear
+    transition all 100ms linear
 .view-title
   color #eee
   font-size 20px
diff --git a/src/renderer/pages/Gallery.vue b/src/renderer/pages/Gallery.vue
index 9732e9f..b79221c 100644
--- a/src/renderer/pages/Gallery.vue
+++ b/src/renderer/pages/Gallery.vue
@@ -139,8 +139,14 @@ export default {
       picBed: []
     }
   },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.getGallery()
+      vm.getPasteStyle()
+      vm.getPicBeds()
+    })
+  },
   created () {
-    this.getGallery()
     this.$electron.ipcRenderer.on('updateGallery', (event) => {
       this.$nextTick(() => {
         this.filterList = this.getGallery()
@@ -148,8 +154,6 @@ export default {
     })
     this.$electron.ipcRenderer.send('getPicBeds')
     this.$electron.ipcRenderer.on('getPicBeds', this.getPicBeds)
-    this.getPasteStyle()
-    this.getPicBeds()
   },
   computed: {
     filterList: {
@@ -368,6 +372,8 @@ export default {
     transition all .2s ease-in-out
     &.active
       transform: rotate(180deg)
+#gallery-view
+  height 100%
 .item-base
   background #2E2E2E
   text-align center
diff --git a/src/renderer/router/index.js b/src/renderer/router/index.js
index 9a951e2..309ef43 100644
--- a/src/renderer/router/index.js
+++ b/src/renderer/router/index.js
@@ -78,7 +78,10 @@ export default new Router({
         {
           path: 'gallery',
           component: require('@/pages/Gallery').default,
-          name: 'gallery'
+          name: 'gallery',
+          meta: {
+            keepAlive: true
+          }
         },
         {
           path: 'setting',
diff --git a/yarn.lock b/yarn.lock
index 868e3fd..6cf16a5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -31,9 +31,9 @@
   dependencies:
     "@types/babel-types" "*"
 
-"@types/node@^8.0.24":
-  version "8.10.39"
-  resolved "http://registry.npm.taobao.org/@types/node/download/@types/node-8.10.39.tgz#e7e87ad00364dd7bc485c940926345b8ec1a26ca"
+"@types/node@^10.12.18":
+  version "10.12.18"
+  resolved "http://registry.npm.taobao.org/@types/node/download/@types/node-10.12.18.tgz#1d3ca764718915584fcd9f6344621b7672665c67"
 
 "@vue/component-compiler-utils@^2.0.0":
   version "2.3.1"
@@ -3247,11 +3247,11 @@ electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.47:
   version "1.3.96"
   resolved "http://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.96.tgz#25770ec99b8b07706dedf3a5f43fa50cb54c4f9a"
 
-electron@4.0.0:
-  version "4.0.0"
-  resolved "http://registry.npm.taobao.org/electron/download/electron-4.0.0.tgz#6ccb40cc8bf2d49954dcea73b97ae7ad12ee04b3"
+electron@4.0.2:
+  version "4.0.2"
+  resolved "http://registry.npm.taobao.org/electron/download/electron-4.0.2.tgz#b5e074c149841490825d0785aa2bc4f5e29bbea4"
   dependencies:
-    "@types/node" "^8.0.24"
+    "@types/node" "^10.12.18"
     electron-download "^4.1.0"
     extract-zip "^1.0.3"