diff --git a/keepassxc-browser/content/keepassxc-browser.js b/keepassxc-browser/content/keepassxc-browser.js
index fb41a35..ef9d738 100755
--- a/keepassxc-browser/content/keepassxc-browser.js
+++ b/keepassxc-browser/content/keepassxc-browser.js
@@ -943,7 +943,13 @@ kpxc.fillFromPopup = async function(id, uuid) {
     }
 
     await sendMessage('page_set_login_id', id);
-    kpxc.fillInCredentials(kpxc.combinations[0], kpxc.credentials[id].login, uuid);
+    const selectedCredentials = kpxc.credentials.find(c => c.uuid === uuid);
+    if (!selectedCredentials) {
+        console.log('Error: Uuid not found: ', uuid);
+        return;
+    }
+
+    kpxc.fillInCredentials(kpxc.combinations[0], selectedCredentials.login, uuid);
     kpxcUserAutocomplete.closeList();
 };
 
@@ -1064,6 +1070,7 @@ kpxc.fillInCredentials = async function(combination, predefinedUsername, uuid, p
     // Find the correct credentials
     const selectedCredentials = kpxc.credentials.find(c => c.uuid === uuid);
     if (!selectedCredentials) {
+        console.log('Error: Uuid not found: ', uuid);
         return;
     }
 
diff --git a/keepassxc-browser/manifest.json b/keepassxc-browser/manifest.json
index d444e96..a5150cd 100755
--- a/keepassxc-browser/manifest.json
+++ b/keepassxc-browser/manifest.json
@@ -1,8 +1,8 @@
 {
     "manifest_version": 2,
     "name": "KeePassXC-Browser",
-    "version": "1.7.7",
-    "version_name": "1.7.7",
+    "version": "1.7.8",
+    "version_name": "1.7.8",
     "description": "__MSG_extensionDescription__",
     "author": "KeePassXC Team",
     "icons": {
diff --git a/package.json b/package.json
index 5ae3e5b..1c452b5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "KeePassXC-Browser",
-  "version": "1.7.7",
+  "version": "1.7.8",
   "description": "KeePassXC-Browser",
   "main": "build.js",
   "devDependencies": {