diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js
index 044a586c68..3c8baa6244 100644
--- a/public/src/modules/navigator.js
+++ b/public/src/modules/navigator.js
@@ -59,9 +59,6 @@ define(function() {
 
 			if (elementInView(el)) {
 				index = parseInt(el.attr('data-index'), 10) + 1;
-				if(index > count) {
-					index = count;
-				}
 
 				navigator.updateTextAndProgressBar();
 
@@ -75,6 +72,7 @@ define(function() {
 	};
 
 	navigator.updateTextAndProgressBar = function() {
+		index = index > count ? count : index;
 		translator.translate('[[global:pagination.out_of, ' + index + ', ' + count + ']]', function(translated) {
 			$('#pagination').html(translated);
 		});