diff --git a/src/common/fieldTypes.ts b/src/common/fieldTypes.ts
index 332c0411..d230740e 100644
--- a/src/common/fieldTypes.ts
+++ b/src/common/fieldTypes.ts
@@ -47,6 +47,12 @@ export const FLOAT = [
    'MONEY'
 ];
 
+export const IS_BIGINT = [
+   'BIGINT',
+   'BIGSERIAL',
+   'DOUBLE PRECISION'
+];
+
 export const BOOLEAN = [
    'BOOL',
    'BOOLEAN'
diff --git a/src/renderer/components/FakerSelect.vue b/src/renderer/components/FakerSelect.vue
index dc9c8ce9..49385bd3 100644
--- a/src/renderer/components/FakerSelect.vue
+++ b/src/renderer/components/FakerSelect.vue
@@ -7,7 +7,7 @@
          :option-label="(opt: any) => opt.name === 'manual' ? t('message.manualValue') : t(`faker.${opt.name}`)"
          option-track-by="name"
          :disabled="!isChecked"
-         style="flex-grow: 0;"
+         :style="'flex-grow: 0;'"
          @change="onChange"
       />
 
@@ -87,7 +87,7 @@
 
 <script setup lang="ts">
 import { computed, PropType, Ref, ref, watch } from 'vue';
-import { TEXT, LONG_TEXT, NUMBER, FLOAT, DATE, TIME, DATETIME, BLOB, BIT, UUID } from 'common/fieldTypes';
+import { TEXT, LONG_TEXT, NUMBER, FLOAT, DATE, TIME, DATETIME, BLOB, BIT, UUID, IS_BIGINT } from 'common/fieldTypes';
 import BaseUploadInput from '@/components/BaseUploadInput.vue';
 import ForeignKeySelect from '@/components/ForeignKeySelect.vue';
 import FakerMethods from 'common/FakerMethods';
@@ -146,8 +146,12 @@ const inputProps = () => {
    if ([...TEXT, ...LONG_TEXT].includes(props.type))
       return { type: 'text', mask: false };
 
-   if ([...NUMBER, ...FLOAT].includes(props.type))
-      return { type: 'number', mask: false };
+   if ([...NUMBER, ...FLOAT].includes(props.type)) {
+      if (IS_BIGINT.includes(props.type))
+         return { type: 'text', mask: false };
+      else
+         return { type: 'number', mask: false };
+   }
 
    if (TIME.includes(props.type)) {
       let timeMask = '##:##:##';
diff --git a/src/renderer/components/WorkspaceTabQueryTableRow.vue b/src/renderer/components/WorkspaceTabQueryTableRow.vue
index cfb9e8ff..98af44ff 100644
--- a/src/renderer/components/WorkspaceTabQueryTableRow.vue
+++ b/src/renderer/components/WorkspaceTabQueryTableRow.vue
@@ -220,7 +220,8 @@ import {
    BINARY,
    HAS_TIMEZONE,
    SPATIAL,
-   IS_MULTI_SPATIAL
+   IS_MULTI_SPATIAL,
+   IS_BIGINT
 } from 'common/fieldTypes';
 import ConfirmModal from '@/components/BaseConfirmModal.vue';
 import TextEditor from '@/components/BaseTextEditor.vue';
@@ -281,8 +282,12 @@ const inputProps = computed(() => {
    if ([...TEXT, ...LONG_TEXT].includes(editingType.value))
       return { type: 'text', mask: false };
 
-   if ([...NUMBER, ...FLOAT].includes(editingType.value))
-      return { type: 'number', mask: false };
+   if ([...NUMBER, ...FLOAT].includes(editingType.value)) {
+      if (IS_BIGINT.includes(editingType.value))
+         return { type: 'text', mask: false };
+      else
+         return { type: 'number', mask: false };
+   }
 
    if (TIME.includes(editingType.value)) {
       let timeMask = '##:##:##';