diff --git a/keepassxc-browser/content/autocomplete.js b/keepassxc-browser/content/autocomplete.js
index 81ba286..3b799dd 100644
--- a/keepassxc-browser/content/autocomplete.js
+++ b/keepassxc-browser/content/autocomplete.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const MAX_AUTOCOMPLETE_NAME_LEN = 50;
+
 const kpxcAutocomplete = {};
 kpxcAutocomplete.autoSubmit = false;
 kpxcAutocomplete.elements = [];
diff --git a/keepassxc-browser/content/keepassxc-browser.js b/keepassxc-browser/content/keepassxc-browser.js
index 5e00bad..9bf6c2d 100755
--- a/keepassxc-browser/content/keepassxc-browser.js
+++ b/keepassxc-browser/content/keepassxc-browser.js
@@ -1140,9 +1140,12 @@ kpxc.initLoginPopup = function() {
     }
 
     const getLoginText = function(credential, withGroup) {
+        const name = credential.name.length < MAX_AUTOCOMPLETE_NAME_LEN
+                   ? credential.name
+                   : credential.name.substr(0, MAX_AUTOCOMPLETE_NAME_LEN) + '…';
         const group = (withGroup && credential.group) ? `[${credential.group}] ` : '';
         const visibleLogin = (credential.login.length > 0) ? credential.login : tr('credentialsNoUsername');
-        const text = `${group}${credential.name} (${visibleLogin})`;
+        const text = `${group}${name} (${visibleLogin})`;
 
         if (credential.expired && credential.expired === 'true') {
             return `${text} [${tr('credentialExpired')}]`;