diff --git a/app/assets/javascripts/vue_pipelines_index/pipelines.vue.js.es6 b/app/assets/javascripts/vue_pipelines_index/pipelines.vue.js.es6
index 77923e68004058806fd35779dbd847fab2a4e376..b72a6d95e35c404a38ce248cafe86d3c98da2a75 100644
--- a/app/assets/javascripts/vue_pipelines_index/pipelines.vue.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/pipelines.vue.js.es6
@@ -34,8 +34,9 @@
       shortsha(pipeline) {
         return pipeline.sha.slice(0, 8);
       },
-      changepage(event) {
-        this.pagenum = +event.target.innerText;
+      changepage(event, last) {
+        if (last) this.pagenum = +last;
+        if (!last) this.pagenum = +event.target.innerText;
         // use p instead of page to avoid rails tyring to make an actual request
         window.history.pushState({}, null, `?p=${this.pagenum}`);
         clearInterval(this.intervalId);
diff --git a/app/assets/javascripts/vue_pipelines_index/vue_gl_pagination.vue.js.es6 b/app/assets/javascripts/vue_pipelines_index/vue_gl_pagination.vue.js.es6
index 56b5ba04b36c29949c395d5f685557f0365295d5..48efa4bd57e7f6f961af2e5be1e60f470ed28444 100644
--- a/app/assets/javascripts/vue_pipelines_index/vue_gl_pagination.vue.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/vue_gl_pagination.vue.js.es6
@@ -48,17 +48,14 @@
           <li :class='pagenumberstatus(n)' v-else>
             <a @click='changepage($event)'>{{(n - 1)}}</a>
           </li>
-          <!--
-            still working on this bit
-            <li class="page" v-if='n === upcount - 1'>
-              <span class="page gap">…</span>
-            </li>
-          -->
+          <li class="page" v-if='n === upcount'>
+            <span class="page gap">…</span>
+          </li>
           <li class="next" v-if='n === upcount'>
             <a rel="next" :href='next'>Next</a>
           </li>
-          <li class="last" v-if='n === upcount'>
-            <a :href='lastpage'>Last »</a>
+          <li class="last" v-if='n === upcount && pagenum !== last'>
+            <a @click='changepage($event, last)'>Last »</a>
           </li>
         </ul>
       </div>