diff --git a/Layout/default/tpl/pagination.php b/Layout/default/tpl/pagination.php
index 6a20c2315..1bd0923b5 100644
--- a/Layout/default/tpl/pagination.php
+++ b/Layout/default/tpl/pagination.php
@@ -8,8 +8,13 @@ $mfPagination_baseurl_params = $pagination_baseurl_params;
 
 $log = mfLoghandler::singleton();
 
+$mfPagination_pagecount_add = 0;
+
 if($mfPagination_pagecount < 12) {
-  for($i = 0; $i < $mfPagination_pagecount+1; $i++) {
+  if($pagination['maxItems'] % $pagination['count'] != 0) {
+    $mfPagination_pagecount_add = 1;
+  }
+  for($i = 0; $i < $mfPagination_pagecount+$mfPagination_pagecount_add; $i++) {
     $mfPagination_baseurl_params['s'] = $i * $pagination['count'];
     $page = [
       's' => $i * $pagination['count'],
@@ -19,6 +24,12 @@ if($mfPagination_pagecount < 12) {
     $mfPagination_pages[$i] = $page;
   }
 } else {
+  
+  if($pagination['maxItems'] % $pagination['count'] != 0) {
+    $mfPagination_pagecount_add = 1;
+  }
+  
+  
   $show_from = $mfPagination_currentpage - 4;
   $show_to = $mfPagination_currentpage + 4;
   
@@ -26,10 +37,10 @@ if($mfPagination_pagecount < 12) {
     $show_from = 1;
   }
   if($show_to > $mfPagination_pagecount) {
-    $show_to = $mfPagination_pagecount+1;
+    $show_to = $mfPagination_pagecount + $mfPagination_pagecount_add;
   }
   
-  for($i = 0; $i < $mfPagination_pagecount+1; $i++) {
+  for($i = 0; $i < $mfPagination_pagecount + $mfPagination_pagecount_add; $i++) {
     if($show_from > 1 && $i == $show_from) {
       $mfPagination_pages[$i] = "separator_before";
       continue;