diff --git a/app/styles/utils/_auto-type-hint.scss b/app/styles/utils/_auto-type-hint.scss
index fd746a6c..a03d6e69 100644
--- a/app/styles/utils/_auto-type-hint.scss
+++ b/app/styles/utils/_auto-type-hint.scss
@@ -6,6 +6,10 @@
     padding: $base-padding;
     box-sizing: border-box;
     overflow: hidden;
+    &__body {
+        height: 100%;
+        overflow-y: auto;
+    }
     &__block {
         margin-bottom: $base-padding-v;
         > a,
diff --git a/app/templates/auto-type-hint.hbs b/app/templates/auto-type-hint.hbs
index 6a8e2ef6..4b97f9b3 100644
--- a/app/templates/auto-type-hint.hbs
+++ b/app/templates/auto-type-hint.hbs
@@ -1,17 +1,19 @@
 <div class="auto-type-hint">
-    <a href="{{link}}" class="auto-type-hint__link-details" target="_blank">{{res 'autoTypeLink'}}</a>
-    <div class="auto-type-hint__block">
-        <div>{{res 'autoTypeEntryFields'}}:</div>
-        <a>{TITLE}</a><a>{USERNAME}</a><a>{URL}</a><a>{PASSWORD}</a><a>{NOTES}</a><a>{GROUP}</a>
-        <a>{TOTP}</a><a>{S:Custom Field Name}</a>
-    </div>
-    <div class="auto-type-hint__block">
-        <div>{{res 'autoTypeModifiers'}}:</div>
-        <a>+ (shift)</a><a>% (alt)</a><a>^ ({{cmd}})</a>{{#if hasCtrl}}<a>^^ (ctrl)</a>{{/if}}
-    </div>
-    <div class="auto-type-hint__block">
-        <div>{{res 'autoTypeKeys'}}:</div>
-        <a>{TAB}</a><a>{ENTER}</a><a>{SPACE}</a><a>{UP}</a><a>{DOWN}</a><a>{LEFT}</a><a>{RIGHT}</a><a>{HOME}</a><a>{END}</a>
-        <a>{+}</a><a>{%}</a><a>{^}</a><a>{~}</a><a>{(}</a><a>{)}</a><a>{[}</a><a>{]}</a><a>\{{}</a><a>{}}</a>
+    <div class="auto-type-hint__body">
+        <a href="{{link}}" class="auto-type-hint__link-details" target="_blank">{{res 'autoTypeLink'}}</a>
+        <div class="auto-type-hint__block">
+            <div>{{res 'autoTypeEntryFields'}}:</div>
+            <a>{TITLE}</a><a>{USERNAME}</a><a>{URL}</a><a>{PASSWORD}</a><a>{NOTES}</a><a>{GROUP}</a>
+            <a>{TOTP}</a><a>{S:Custom Field Name}</a>
+        </div>
+        <div class="auto-type-hint__block">
+            <div>{{res 'autoTypeModifiers'}}:</div>
+            <a>+ (shift)</a><a>% (alt)</a><a>^ ({{cmd}})</a>{{#if hasCtrl}}<a>^^ (ctrl)</a>{{/if}}
+        </div>
+        <div class="auto-type-hint__block">
+            <div>{{res 'autoTypeKeys'}}:</div>
+            <a>{TAB}</a><a>{ENTER}</a><a>{SPACE}</a><a>{UP}</a><a>{DOWN}</a><a>{LEFT}</a><a>{RIGHT}</a><a>{HOME}</a><a>{END}</a>
+            <a>{+}</a><a>{%}</a><a>{^}</a><a>{~}</a><a>{(}</a><a>{)}</a><a>{[}</a><a>{]}</a><a>\{{}</a><a>{}}</a>
+        </div>
     </div>
 </div>