diff --git a/frontend/src/components/PaginationButtons.vue b/frontend/src/components/PaginationButtons.vue
index 252301388..bf2c19488 100644
--- a/frontend/src/components/PaginationButtons.vue
+++ b/frontend/src/components/PaginationButtons.vue
@@ -7,7 +7,7 @@
         </b-button>
       </b-col>
       <b-col cols="3">
-        <p class="text-center pt-2">{{ currentPage }} / {{ totalPages }}</p>
+        <p class="text-center pt-2">{{ value }} / {{ totalPages }}</p>
       </b-col>
       <b-col>
         <b-button class="next-page" :disabled="!hasNext" @click="$emit('show-next')">
@@ -18,13 +18,35 @@
   </div>
 </template>
 <script>
-export default {
-  name: 'PaginationButtons',
-  props: {
-    hasNext: { type: Boolean, default: false },
-    hasPrevious: { type: Boolean, default: false },
-    totalPages: { type: Number, default: 1 },
-    currentPage: { type: Number, default: 1 },
-  },
-}
+ export default {
+   name: 'PaginationButtons',
+   props: {
+     totalRows: { type: Number, required: true },
+     pageSize: { type: Number, required: true },
+     value: { type: Number, , required: true },
+   },
+   computed: {
+     hasNext() {
+       return this.value * this.pageSize < this.totalCount
+     },
+     hasPrevious() {
+       return this.value > 1
+     },
+     totalPages() {
+       return Math.ceil(this.totalCount / this.pageSize)
+     },
+   },
+   methods: {
+     showNext() {
+       this.value++
+       this.updateGdt()
+       window.scrollTo(0, 0)
+     },
+     showPrevious() {
+       this.value--
+       this.updateGdt()
+       window.scrollTo(0, 0)
+     },
+   },
+ }
 </script>
diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
index 1ad4ba13e..8f1fd2839 100644
--- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
@@ -29,10 +29,9 @@
     </div>
     <pagination-buttons
       v-if="transactionGdtCount > pageSize"
-      :has-next="hasNext"
-      :has-previous="hasPrevious"
-      :total-pages="totalPages"
-      :current-page="currentPage"
+      v-model="currentPage"
+      :per-page="pageSize"
+      :total-rows="transactionGdtCount"
       @show-next="showNext"
       @show-previous="showPrevious"
     ></pagination-buttons>
@@ -58,17 +57,6 @@ export default {
       pageSize: 25,
     }
   },
-  computed: {
-    hasNext() {
-      return this.currentPage * this.pageSize < this.transactionGdtCount
-    },
-    hasPrevious() {
-      return this.currentPage > 1
-    },
-    totalPages() {
-      return Math.ceil(this.transactionGdtCount / this.pageSize)
-    },
-  },
   methods: {
     async updateGdt() {
       this.$apollo