diff --git a/packages/web/src/datagrid/DataGridCore.svelte b/packages/web/src/datagrid/DataGridCore.svelte
index df913d536..a980cf8ad 100644
--- a/packages/web/src/datagrid/DataGridCore.svelte
+++ b/packages/web/src/datagrid/DataGridCore.svelte
@@ -245,6 +245,7 @@
   import openReferenceForm, { openPrimaryKeyForm } from '../formview/openReferenceForm';
   import openNewTab from '../utility/openNewTab';
   import ErrorInfo from '../elements/ErrorInfo.svelte';
+  import resizeObserver from '../utility/resizeObserver';
 
   export let onLoadNextData = undefined;
   export let grider = undefined;
@@ -1067,11 +1068,13 @@
             class="header-cell"
             data-row="header"
             data-col="header"
-            bind:clientHeight={rowHeight}
+            use:resizeObserver={true}
+            on:resize={e => {
+              // @ts-ignore
+              rowHeight = e.detail.height;
+            }}
             style={`width:${headerColWidth}px; min-width:${headerColWidth}px; max-width:${headerColWidth}px`}
-          >
-             
-          </td>
+          />
           {#each visibleRealColumns as col (col.uniqueName)}
             <td
               class="header-cell"
diff --git a/packages/web/src/formview/FormView.svelte b/packages/web/src/formview/FormView.svelte
index 81e0c6afe..aca8a0588 100644
--- a/packages/web/src/formview/FormView.svelte
+++ b/packages/web/src/formview/FormView.svelte
@@ -459,7 +459,7 @@
                 class="header-cell"
                 data-row={rowIndex}
                 data-col={chunkIndex * 2}
-                style={`height: ${rowHeight}px`}
+                style={rowHeight > 1 ? `height: ${rowHeight}px` : undefined}
                 class:isSelected={currentCell[0] == rowIndex && currentCell[1] == chunkIndex * 2}
                 bind:this={domCells[`${rowIndex},${chunkIndex * 2}`]}
                 use:resizeObserver={chunkIndex == 0 && rowIndex == 0}
@@ -561,6 +561,7 @@
     right: 0;
     display: flex;
     overflow-x: scroll;
+    align-items: flex-start;
   }
 
   tr {