diff --git a/packages/datalib/src/TableFormViewDisplay.ts b/packages/datalib/src/TableFormViewDisplay.ts
index 0114a8b7d..538ea7dd3 100644
--- a/packages/datalib/src/TableFormViewDisplay.ts
+++ b/packages/datalib/src/TableFormViewDisplay.ts
@@ -38,6 +38,7 @@ export class TableFormViewDisplay extends FormViewDisplay {
     this.columns = [];
     this.addDisplayColumns(this.gridDisplay.columns);
     this.baseTable = this.gridDisplay.baseTable;
+    this.gridDisplay.hintBaseColumns = this.columns;
   }
 
   addDisplayColumns(columns: DisplayColumn[]) {
diff --git a/packages/datalib/src/TableGridDisplay.ts b/packages/datalib/src/TableGridDisplay.ts
index 109b2f2c7..0bd00f4bd 100644
--- a/packages/datalib/src/TableGridDisplay.ts
+++ b/packages/datalib/src/TableGridDisplay.ts
@@ -8,6 +8,7 @@ import { filterName } from './filterName';
 export class TableGridDisplay extends GridDisplay {
   public table: TableInfo;
   public addAllExpandedColumnsToSelected = false;
+  public hintBaseColumns: DisplayColumn[];
 
   constructor(
     public tableName: NamedObjectInfo,
@@ -114,7 +115,7 @@ export class TableGridDisplay extends GridDisplay {
   addHintsToSelect(select: Select): boolean {
     let res = false;
     const groupColumns = this.groupColumns;
-    for (const column of this.getGridColumns()) {
+    for (const column of this.hintBaseColumns || this.getGridColumns()) {
       if (column.foreignKey) {
         if (groupColumns && !groupColumns.includes(column.uniqueName)) {
           continue;