diff --git a/publish/changeLog.md b/publish/changeLog.md
index 38efdfab..5cb3b867 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -1,3 +1,11 @@
+### 新增
+
+- 新增强迫症设置-离开搜索界面时是否清空搜索框
+
+### 优化
+
+- 略微优化最小化按钮字符
+
 ### 修复
 
 - 修复下载管理的一些Bug
diff --git a/src/renderer/components/core/Toolbar.vue b/src/renderer/components/core/Toolbar.vue
index 240b7bef..33e9c7ea 100644
--- a/src/renderer/components/core/Toolbar.vue
+++ b/src/renderer/components/core/Toolbar.vue
@@ -88,7 +88,7 @@ each(@themes, {
       opacity: 1;
     }
   }
-  
+
   button {
     position: relative;
     width: @height-toolbar;
@@ -113,12 +113,6 @@ each(@themes, {
     &:before {
       display: block;
       position: absolute;
-      left: 50%;
-      top: 50%;
-      transform: translate(-50%, -50%);
-      font-size: 14px;
-      line-height: 1;
-      color: #fff;
       opacity: 0;
       transition: opacity @transition-theme;
     }
@@ -147,13 +141,23 @@ each(@themes, {
 }
 .min {
   &:before {
-    content: '－';
-    font-size: 15px;
+    content: ' ';
+    width: 8px;
+    height: 2px;
+    left: @height-toolbar / 2 - 4;
+    top: @height-toolbar / 2;
+    background-color: #fff;
   }
 }
 .close {
   &:before {
     content: '×';
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    font-size: 14px;
+    line-height: 1;
+    color: #fff;
   }
 }
 </style>
diff --git a/src/renderer/components/material/SearchInput.vue b/src/renderer/components/material/SearchInput.vue
index 024b33be..d769bd07 100644
--- a/src/renderer/components/material/SearchInput.vue
+++ b/src/renderer/components/material/SearchInput.vue
@@ -34,8 +34,11 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['source']),
+    ...mapGetters(['source', 'route', 'setting']),
     ...mapGetters('search', ['info']),
+    isAutoClearInput() {
+      return this.setting.odc.isAutoClearSearchInput
+    },
   },
   watch: {
     list(n) {
@@ -46,6 +49,9 @@ export default {
     'info.text'(n) {
       if (n !== this.text) this.text = n
     },
+    route(n) {
+      if (this.isAutoClearInput && n.name != 'search' && this.text) this.text = ''
+    },
   },
   methods: {
     handleTemplistClick(index) {
diff --git a/src/renderer/main.js b/src/renderer/main.js
index 86203fa2..67630453 100644
--- a/src/renderer/main.js
+++ b/src/renderer/main.js
@@ -1,5 +1,5 @@
 import Vue from 'vue'
-// import { sync } from 'vuex-router-sync'
+import { sync } from 'vuex-router-sync'
 
 // Components
 import './components'
@@ -11,7 +11,7 @@ import App from './App'
 import router from './route'
 import store from './store'
 
-// sync(store, router)
+sync(store, router)
 
 if (!process.env.IS_WEB) {
 
diff --git a/src/renderer/store/getters.js b/src/renderer/store/getters.js
index 9a445322..e94ba3b6 100644
--- a/src/renderer/store/getters.js
+++ b/src/renderer/store/getters.js
@@ -31,4 +31,7 @@ export default {
   version(state) {
     return state.version
   },
+  route(state) {
+    return state.route
+  },
 }
diff --git a/src/renderer/utils/index.js b/src/renderer/utils/index.js
index d4660c33..ed17f3dd 100644
--- a/src/renderer/utils/index.js
+++ b/src/renderer/utils/index.js
@@ -163,7 +163,7 @@ export const isChildren = (parent, children) => {
  * @param {*} setting
  */
 export const updateSetting = setting => {
-  const defaultVersion = '1.0.6'
+  const defaultVersion = '1.0.7'
   const defaultSetting = {
     version: defaultVersion,
     player: {
@@ -194,6 +194,9 @@ export const updateSetting = setting => {
         id: null,
       },
     },
+    odc: {
+      isAutoClearSearchInput: false,
+    },
     themeId: 0,
     sourceId: 'kw',
     apiSource: 'test',
diff --git a/src/renderer/views/Setting.vue b/src/renderer/views/Setting.vue
index 27a0cbd3..40fd20ad 100644
--- a/src/renderer/views/Setting.vue
+++ b/src/renderer/views/Setting.vue
@@ -62,6 +62,11 @@ div.scroll(:class="$style.setting")
       h3 专辑栏
       div
         material-checkbox(id="setting_list_showalbum" v-model="current_setting.list.isShowAlbumName" label="是否显示专辑栏")
+    dt 强迫症设置
+    dd
+      h3 离开搜索界面时清空搜索框
+      div
+        material-checkbox(id="setting_odc_isAutoClearSearchInput" v-model="current_setting.odc.isAutoClearSearchInput" label="是否启用")
     dt 备份与恢复
     dd
       h3 部分数据
@@ -157,6 +162,9 @@ export default {
           isDownloadLrc: false,
           isEmbedPic: true,
         },
+        odc: {
+          isAutoClearSearchInput: false,
+        },
         themeId: 0,
         sourceId: 0,
         randomAnimate: true,