diff --git a/admin-dev/themes/default/template/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/helpers/list/list_footer.tpl
index e6cb8841f..8638b7f6d 100644
--- a/admin-dev/themes/default/template/helpers/list/list_footer.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_footer.tpl
@@ -110,12 +110,12 @@
 					</li>
 				{/if}
 			{/while}
-			<li {if $page > $total_pages}class="disabled"{/if}>
+			<li {if $page >= $total_pages}class="disabled"{/if}>
 				<a href="javascript:void(0);" class="pagination-link" data-page="{$page + 1}" data-list-id="{$list_id}">
 					<i class="icon-angle-right"></i>
 				</a>
 			</li>
-			<li {if $page > $total_pages}class="disabled"{/if}>
+			<li {if $page >= $total_pages}class="disabled"{/if}>
 				<a href="javascript:void(0);" class="pagination-link" data-page="{$total_pages}" data-list-id="{$list_id}">
 					<i class="icon-double-angle-right"></i>
 				</a>
@@ -124,7 +124,9 @@
 		<script type="text/javascript">
 			$('.pagination-link').on('click',function(e){
 				e.preventDefault();
-				$('#submitFilter'+$(this).data("list-id")).val($(this).data("page")).closest("form").submit();
+
+				if (!$(this).parent().hasClass('disabled'))
+					$('#submitFilter'+$(this).data("list-id")).val($(this).data("page")).closest("form").submit();
 			});
 		</script>
 	</div>
diff --git a/admin-dev/themes/default/template/helpers/list/list_header.tpl b/admin-dev/themes/default/template/helpers/list/list_header.tpl
index 4323bc617..5042f3bdc 100644
--- a/admin-dev/themes/default/template/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_header.tpl
@@ -76,6 +76,7 @@
 
 {if !$simple_header}
 <form method="post" action="{$action}" class="form-horizontal">
+	<input type="hidden" id="submitFilter{$list_id}" name="submitFilter{$list_id}" value="0"/>
 	{block name="override_form_extra"}{/block}
 	<div class="panel col-lg-12">
 		<div class="panel-heading">
@@ -300,7 +301,6 @@
 					{if $has_actions}
 					<td class="actions">
 						{if $show_filters}
-						<input type="hidden" id="submitFilter{$list_id}" name="submitFilter{$list_id}" value="0"/>
 						<span class="pull-right">
 							{*Search must be before reset for default form submit*}
 							<button type="submit" id="submitFilterButton{$list_id}" name="submitFilter" class="btn btn-default" data-list-id="{$list_id}">