diff --git a/src/js/index.js b/src/js/index.js
index 3543e53..b09a981 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -727,7 +727,8 @@
         DOM.extendedPubKey.val(extendedPubKey);
         // Display the addresses and privkeys
         clearAddressesList();
-        displayAddresses(0, 20);
+        var initialAddressCount = parseInt(DOM.rowsToAdd.val());
+        displayAddresses(0, initialAddressCount);
     }
 
     function displayAddresses(start, total) {