diff --git a/static/directives/repo-view/repo-panel-tags.html b/static/directives/repo-view/repo-panel-tags.html
index 420f95f60..e1d94db67 100644
--- a/static/directives/repo-view/repo-panel-tags.html
+++ b/static/directives/repo-view/repo-panel-tags.html
@@ -53,7 +53,7 @@
      </span>
 
      <span class="co-filter-box">
-      <span class="page-controls" total-count="tags.length" current-page="options.page" page-size="50"></span>
+      <span class="page-controls" total-count="tags.length" current-page="options.page" page-size="tagsPerPage"></span>
       <input class="form-control" type="text" ng-model="options.tagFilter" placeholder="Filter Tags...">
      </span>
    </div>
diff --git a/static/js/directives/repo-view/repo-panel-tags.js b/static/js/directives/repo-view/repo-panel-tags.js
index 95e365a56..e7618bb35 100644
--- a/static/js/directives/repo-view/repo-panel-tags.js
+++ b/static/js/directives/repo-view/repo-panel-tags.js
@@ -169,6 +169,7 @@ angular.module('quay').directive('repoPanelTags', function () {
       $scope.trackLineClass = function(index, track_info) {
         var startIndex = $.inArray(track_info.tags[0], $scope.tags);
         var endIndex = $.inArray(track_info.tags[track_info.tags.length - 1], $scope.tags);
+        index += $scope.options.page * $scope.tagsPerPage;
 
         if (index == startIndex) {
           return 'start';