diff --git a/keepassxc-browser/content/fields.js b/keepassxc-browser/content/fields.js
index 4f18a5c..d27f0a2 100644
--- a/keepassxc-browser/content/fields.js
+++ b/keepassxc-browser/content/fields.js
@@ -301,7 +301,9 @@ kpxcFields.getElementFromXPathId = function(xpath) {
 kpxcFields.handleSegmentedTOTPFields = function(inputs, combinations) {
     // Check for multiple segmented TOTP fields when there are no inputs, or combination contains the segemented fields
     const segmentedFields = combinations.filter(c => c.totp);
-    if (combinations.length === 0 || segmentedFields.length === DEFAULT_SEGMENTED_TOTP_FIELDS) {
+    if (combinations.length === 0
+        || segmentedFields.length === DEFAULT_SEGMENTED_TOTP_FIELDS
+        || inputs?.length === DEFAULT_SEGMENTED_TOTP_FIELDS) {
         kpxcFields.getSegmentedTOTPFields(inputs, combinations);
     }