diff --git a/View/Elements/pagination.ctp b/View/Elements/pagination.ctp
index 1a0b1e0..1f0d819 100644
--- a/View/Elements/pagination.ctp
+++ b/View/Elements/pagination.ctp
@@ -124,14 +124,14 @@ $includeGoto = isset($goto) ? $goto : true;
             <select name="pageLimit" id="pageLimit">
                 <option value="20">20</option>
                 <option value="50">50</option>
-                <option value="all">all</option>
+                <option value="<?php echo $this->Paginator->params()['count'] ?>">All</option>
             </select>
             <p class=""><?php print _txt('fd.page.limit.records'); ?></p>
             <input type="submit" value="<?php print _txt('op.go'); ?>" class="btn btn-primary-light" />
             <script type="text/javascript">
                 $(function() {
                     // Check if the currentLimit holds an appropriate value on first load, and set the select option
-                    if (currentLimit != '' && (currentLimit == '2' || currentLimit == '4' || currentLimit == '6')) {
+                    if (currentLimit != '' && (currentLimit == '20' || currentLimit == '50' || currentLimit == '<?php echo $this->Paginator->params()['count'] ?>')) {
                         $("#pageLimit").val(currentLimit);
                     }
                 });