diff --git a/src/Kp2aAutofillParser/AutofillParser.cs b/src/Kp2aAutofillParser/AutofillParser.cs
index 718cfb5a..54ed4768 100644
--- a/src/Kp2aAutofillParser/AutofillParser.cs
+++ b/src/Kp2aAutofillParser/AutofillParser.cs
@@ -730,7 +730,7 @@ namespace Kp2aAutofillParser
     {
         public List<TField> InputFields { get; set; } = new List<TField>();
 
-        public string PackageId { get; set; } = null;
+        public string? PackageId { get; set; } = null;
         public string WebDomain { get; set; } = null;
     }
 
diff --git a/src/keepass2android-app/services/AutofillBase/StructureParser.cs b/src/keepass2android-app/services/AutofillBase/StructureParser.cs
index 09aa9ac0..2ababeb1 100644
--- a/src/keepass2android-app/services/AutofillBase/StructureParser.cs
+++ b/src/keepass2android-app/services/AutofillBase/StructureParser.cs
@@ -86,6 +86,8 @@ namespace keepass2android.services.AutofillBase
                 ParseRecursive(autofillView, view, isManualRequest);
             }
 
+            autofillView.PackageId = autofillView.PackageId ?? _structure.ActivityComponent.PackageName;
+
             return autofillView;
 
         }
@@ -122,7 +124,6 @@ namespace keepass2android.services.AutofillBase
             }
 
             autofillView.InputFields.Add(new ViewNodeInputField(viewNode));
-          
             var childrenSize = viewNode.ChildCount;
             if (childrenSize > 0)
             {