diff --git a/src/common/interfaces/antares.ts b/src/common/interfaces/antares.ts
index 6a504d7a..753bd81b 100644
--- a/src/common/interfaces/antares.ts
+++ b/src/common/interfaces/antares.ts
@@ -125,7 +125,7 @@ export interface TableField {
    alias: string;
    tableAlias: string;
    orgTable: string;
-   key?: 'pri' | 'uni';
+   key?: 'pri' | 'uni' | '';
 }
 
 export interface TableIndex {
diff --git a/src/renderer/components/WorkspaceTabQueryTable.vue b/src/renderer/components/WorkspaceTabQueryTable.vue
index a47408c4..ce72c893 100644
--- a/src/renderer/components/WorkspaceTabQueryTable.vue
+++ b/src/renderer/components/WorkspaceTabQueryTable.vue
@@ -634,8 +634,11 @@ watch(resultsetIndex, () => {
    setLocalResults();
 });
 
-watch(() => props.isSelected, (val) => {
-   if (val) refreshScroller();
+watch(() => props.isSelected, async (val) => {
+   if (val) {
+      await nextTick();
+      refreshScroller();
+   }
 });
 
 onUpdated(() => {