diff --git a/src/renderer/components/WorkspaceTableTab.vue b/src/renderer/components/WorkspaceTableTab.vue
index f0917036..faf90f35 100644
--- a/src/renderer/components/WorkspaceTableTab.vue
+++ b/src/renderer/components/WorkspaceTableTab.vue
@@ -41,8 +41,23 @@
                   >
                      <i class="mdi mdi-24px mdi-skip-previous" />
                   </button>
-                  <div class="btn btn-dark btn-sm mr-0 text-bold c-auto px-2">
-                     {{ page }}
+                  <div class="dropdown" :class="{'active': isPageMenu}">
+                     <div class="btn-group" @click="openPageMenu">
+                        <div class="btn btn-dark btn-sm mr-0 dropdown-toggle text-bold px-3">
+                           {{ page }}
+                        </div>
+                        <div class="menu px-3">
+                           <span>{{ $t('message.pageNumber') }}</span>
+                           <input
+                              ref="pageSelect"
+                              v-model="pageProxy"
+                              type="number"
+                              min="1"
+                              class="form-input"
+                              @blur="setPageNumber"
+                           >
+                        </div>
+                     </div>
                   </div>
                   <button
                      class="btn btn-dark btn-sm mr-0"
@@ -172,6 +187,7 @@ export default {
       return {
          tabUid: 'data',
          isQuering: false,
+         isPageMenu: false,
          results: [],
          lastTable: null,
          isAddModal: false,
@@ -179,7 +195,8 @@ export default {
          autorefreshTimer: 0,
          refreshInterval: null,
          sortParams: {},
-         page: 1
+         page: 1,
+         pageProxy: 1
       };
    },
    computed: {
@@ -229,8 +246,11 @@ export default {
             this.$refs.queryTable.resetSort();
          }
       },
-      page () {
-         this.getTableData();
+      page (val, oldVal) {
+         if (val && val > 0 && val !== oldVal) {
+            this.pageProxy = this.page;
+            this.getTableData();
+         }
       },
       isSelected (val) {
          if (val && this.lastTable !== this.table) {
@@ -292,11 +312,30 @@ export default {
          this.sortParams = sortParams;
          this.getTableData(sortParams);
       },
+      openPageMenu () {
+         if (this.isQuering) return;
+
+         this.isPageMenu = true;
+         if (this.isPageMenu)
+            setTimeout(() => this.$refs.pageSelect.focus(), 20);
+      },
+      setPageNumber () {
+         this.isPageMenu = false;
+
+         if (this.pageProxy > 0)
+            this.page = this.pageProxy;
+         else
+            this.pageProxy = this.page;
+      },
       pageChange (direction) {
          if (this.isQuering) return;
 
-         if (direction === 'next' && (this.results.length && this.results[0].rows.length === this.limit))
-            this.page++;
+         if (direction === 'next' && (this.results.length && this.results[0].rows.length === this.limit)) {
+            if (!this.page)
+               this.page = 2;
+            else
+               this.page++;
+         }
          else if (direction === 'prev' && this.page > 1)
             this.page--;
       },
diff --git a/src/renderer/i18n/en-US.js b/src/renderer/i18n/en-US.js
index 1aab01db..2f088e9a 100644
--- a/src/renderer/i18n/en-US.js
+++ b/src/renderer/i18n/en-US.js
@@ -215,7 +215,8 @@ module.exports = {
       deleteSchema: 'Delete schema',
       markdownSupported: 'Markdown supported',
       plantATree: 'Plant a Tree',
-      dataTabPageSize: 'DATA tab page size'
+      dataTabPageSize: 'DATA tab page size',
+      pageNumber: 'Page number'
    },
    faker: {
       address: 'Address',