diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.html b/frontend/src/app/components/transactions-list/transactions-list.component.html
index 139da368b..8368a62c4 100644
--- a/frontend/src/app/components/transactions-list/transactions-list.component.html
+++ b/frontend/src/app/components/transactions-list/transactions-list.component.html
@@ -153,7 +153,7 @@
                   <ng-template #showMoreInputsLabel>
                     <span i18n="show-more">Show more</span>
                   </ng-template>
-                  ({{ tx.vin.length - getVinLimit(tx) }} <span i18n="inputs-remaining">remaining</span> )
+                  ({{ tx.vin.length - getVinLimit(tx) }} <span i18n="inputs-remaining">remaining</span>)
                 </button>
               </td>
             </tr>
@@ -270,7 +270,7 @@
                   <ng-template #showMoreOutputsLabel>
                     <span i18n="show-more">Show more</span>
                   </ng-template>
-                  ({{ tx.vout.length - getVoutLimit(tx) }} <span i18n="outputs-remaining">remaining</span> )
+                  ({{ tx.vout.length - getVoutLimit(tx) }} <span i18n="outputs-remaining">remaining</span>)
                 </button>
               </td>
             </tr>
diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.ts b/frontend/src/app/components/transactions-list/transactions-list.component.ts
index be5bd5343..b09226f33 100644
--- a/frontend/src/app/components/transactions-list/transactions-list.component.ts
+++ b/frontend/src/app/components/transactions-list/transactions-list.component.ts
@@ -230,19 +230,29 @@ export class TransactionsListComponent implements OnInit, OnChanges {
   }
 
   getVinLimit(tx: Transaction, next = false): number {
+    let limit;
     if ((tx['@vinLimit'] || 0) > this.inputRowLimit) {
-      return Math.min(tx['@vinLimit'] + (next ? this.showMoreIncrement : 0), tx.vin.length);
+      limit = Math.min(tx['@vinLimit'] + (next ? this.showMoreIncrement : 0), tx.vin.length);
     } else {
-      return Math.min((next ? this.showMoreIncrement : this.inputRowLimit), tx.vin.length);
+      limit = Math.min((next ? this.showMoreIncrement : this.inputRowLimit), tx.vin.length);
     }
+    if (tx.vin.length - limit <= 5) {
+      limit = tx.vin.length;
+    }
+    return limit;
   }
 
   getVoutLimit(tx: Transaction, next = false): number {
+    let limit;
     if ((tx['@voutLimit'] || 0) > this.outputRowLimit) {
-      return Math.min(tx['@voutLimit'] + (next ? this.showMoreIncrement : 0), tx.vout.length);
+      limit = Math.min(tx['@voutLimit'] + (next ? this.showMoreIncrement : 0), tx.vout.length);
     } else {
-      return Math.min((next ? this.showMoreIncrement : this.outputRowLimit), tx.vout.length);
+      limit = Math.min((next ? this.showMoreIncrement : this.outputRowLimit), tx.vout.length);
     }
+    if (tx.vout.length - limit <= 5) {
+      limit = tx.vout.length;
+    }
+    return limit;
   }
 
   ngOnDestroy(): void {