diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 1509958f..7d1af92e 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -201,6 +201,10 @@
     "message": "Counter Based",
     "description": "Counter Based"
   },
+  "counter": {
+    "message": "Counter",
+    "description": "HOTP counter value"
+  },
   "resize_popup_page": {
     "message": "Preferences",
     "description": "Popup Page Settings"
diff --git a/src/components/Popup/EntryComponent.vue b/src/components/Popup/EntryComponent.vue
index 92099b5b..6cb43668 100644
--- a/src/components/Popup/EntryComponent.vue
+++ b/src/components/Popup/EntryComponent.vue
@@ -69,6 +69,18 @@
         v-on:change="entry.update(encryption)"
       />
     </div>
+    <div
+      class="issuerEdit"
+      v-if="entry.type === OTPType.hotp || entry.type === OTPType.hhex"
+    >
+      <input
+        type="number"
+        min="0"
+        v-model.number="entry.counter"
+        v-bind:placeholder="i18n.counter"
+        v-on:change="onCounterChange(entry)"
+      />
+    </div>
     <div
       class="showqr"
       v-if="shouldShowQrIcon(entry)"
@@ -194,6 +206,10 @@ export default Vue.extend({
       }, 3000);
       return;
     },
+    onCounterChange(entry: OTPEntry) {
+      entry.generate();
+      entry.update();
+    },
     async copyCode(entry: OTPEntry) {
       if (
         this.$store.state.style.style.isEditing ||