diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 03166ce27..186abf0e2 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -511,5 +511,9 @@
     },
     "permission_unknown_permission": {
         "message": "Unknown permission. If see this message, please send a bug report."
+    },
+    "hide_codes": {
+        "message": "Hide codes",
+        "description": "Hide codes and show stars in popup. Users need to click the account to copy the code."
     }
 }
diff --git a/src/components/Popup/EntryComponent.vue b/src/components/Popup/EntryComponent.vue
index 904feeae5..ffc09dcb1 100644
--- a/src/components/Popup/EntryComponent.vue
+++ b/src/components/Popup/EntryComponent.vue
@@ -106,7 +106,7 @@ const computedPrototype = [
     "encryption",
   ]),
   mapState("style", ["style"]),
-  mapState("menu", ["theme"]),
+  mapState("menu", ["theme", "hideCodes"]),
 ];
 
 let computed = {};
@@ -142,6 +142,8 @@ export default Vue.extend({
         return this.i18n.encrypted;
       } else if (code === CodeState.Invalid) {
         return this.i18n.invalid;
+      } else if (this.$store.state.menu.hideCodes) {
+        return code.replace(/\w/g, "*");
       } else {
         return code;
       }
diff --git a/src/components/Popup/PreferencesPage.vue b/src/components/Popup/PreferencesPage.vue
index 7926e33b4..9db7ea5be 100644
--- a/src/components/Popup/PreferencesPage.vue
+++ b/src/components/Popup/PreferencesPage.vue
@@ -37,6 +37,7 @@
       @change="migrateStorage()"
     />
     <a-toggle-input :label="i18n.smart_filter" v-model="smartFilter" />
+    <a-toggle-input :label="i18n.hide_codes" v-model="hideCodes" />
     <a-toggle-input
       :label="i18n.enable_context_menu"
       v-model="enableContextMenu"
@@ -141,6 +142,14 @@ export default Vue.extend({
         return !isFirefox && !isSafari;
       },
     },
+    hideCodes: {
+      get(): boolean {
+        return this.$store.state.menu.hideCodes;
+      },
+      set(hideCodes: boolean) {
+        this.$store.commit("menu/setHideCodes", hideCodes);
+      },
+    },
   },
   data() {
     return {
diff --git a/src/definitions/module-interface.d.ts b/src/definitions/module-interface.d.ts
index 3dc038637..9bae1ac81 100644
--- a/src/definitions/module-interface.d.ts
+++ b/src/definitions/module-interface.d.ts
@@ -38,6 +38,7 @@ interface MenuState {
   theme: string;
   backupDisabled: boolean;
   storageArea: "sync" | "local";
+  hideCodes: boolean;
 }
 
 interface StyleState {
diff --git a/src/store/Menu.ts b/src/store/Menu.ts
index e6f1428b9..53d78b5f4 100644
--- a/src/store/Menu.ts
+++ b/src/store/Menu.ts
@@ -28,6 +28,7 @@ export class Menu implements Module {
         passwordPolicyHint: await ManagedStorage.get<string>(
           "passwordPolicyHint"
         ),
+        hideCodes: localStorage.hideCodes === "true",
       },
       mutations: {
         setZoom: (state: MenuState, zoom: number) => {
@@ -56,6 +57,10 @@ export class Menu implements Module {
           state.autolock = autolock;
           localStorage.autolock = autolock;
         },
+        setHideCoes(state: MenuState, hideCodes: boolean) {
+          state.hideCodes = hideCodes;
+          localStorage.hideCodes = hideCodes;
+        },
       },
       namespaced: true,
     };