diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index 2f3e68ae3a432b15ebed00e824bed55cb1053ea7..36c4e1ad2806218896a9470bbb33c22ef15241b4 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -70,17 +70,17 @@ export default {
     computed: {
         toggleSearchToolbar: {
             get () { return this.$store.state.showSearchToolbar}, 
-            set () { this.$store.commit("toggleSearchToolbar")
+            set () { this.$store.commit("toggle", "showSearchToolbar")
             }
         },
         toggleHGNO: {
             get () { return this.$store.state.showHGNO}, 
-            set () { this.$store.commit("toggleHGNO")
+            set () { this.$store.commit("toggle", "showHGNO")
             }
         },
         toggleInflectionNo: {
             get () { return this.$store.state.showInflectionNo}, 
-            set () { this.$store.commit("toggleInflectionNo")
+            set () { this.$store.commit("toggle", "showInflectionNo")
             }
         },
 
diff --git a/src/main.js b/src/main.js
index 613b04c56a28392313a3c3fdd46f4e80f2fc18a3..f791ea85ce0a6a034dc432275a8d32aea4ffda3e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -42,12 +42,12 @@ const store = new Vuex.Store({
     },
     changeLocale(state, locale) {
       state.currentLocale = locale
-      localStorage.setItem("showSearchToolbar", locale);
+      localStorage.setItem("currentLocale", locale);
     },
-    toggleSearchToolbar(state) {
-      let value = !state.showSearchToolbar
-      state.showSearchToolbar = value
-      localStorage.setItem("showSearchToolbar", value);
+    toggle(state, setting) {
+      let value = !state[setting]
+      state[setting] = value
+      localStorage.setItem(setting, value);
     }
   }
 })