diff --git a/packages/web/src/App.svelte b/packages/web/src/App.svelte
index 9683b6adc..7f912b475 100644
--- a/packages/web/src/App.svelte
+++ b/packages/web/src/App.svelte
@@ -21,5 +21,5 @@
 {#if $settings}
   <Screen />
 {:else}
-  <LoadingInfo message="Loading settings..." />
+  <LoadingInfo message="Loading settings..." wrapper />
 {/if}
diff --git a/packages/web/src/datagrid/DataGridCell.svelte b/packages/web/src/datagrid/DataGridCell.svelte
index 0457dee7c..98d8fc813 100644
--- a/packages/web/src/datagrid/DataGridCell.svelte
+++ b/packages/web/src/datagrid/DataGridCell.svelte
@@ -25,7 +25,7 @@
   export let col;
   export let rowData;
   export let colIndex = undefined;
-  export let hintFieldsAllowed = undefined;
+  export let allowHintField = false;
 
   export let isSelected = false;
   export let isFrameSelected = false;
@@ -107,7 +107,7 @@
       {value.toString()}
     {/if}
 
-    {#if hintFieldsAllowed && hintFieldsAllowed.includes(col.uniqueName) && rowData && rowData[col.hintColumnName]}
+    {#if allowHintField && rowData && rowData[col.hintColumnName]}
       <span class="hint">{rowData[col.hintColumnName]}</span>
     {/if}
 
diff --git a/packages/web/src/datagrid/DataGridRow.svelte b/packages/web/src/datagrid/DataGridRow.svelte
index 1d7ca3920..1b44b8a05 100644
--- a/packages/web/src/datagrid/DataGridRow.svelte
+++ b/packages/web/src/datagrid/DataGridRow.svelte
@@ -51,7 +51,7 @@
         {rowIndex}
         {rowData}
         {col}
-        {hintFieldsAllowed}
+        allowHintField={hintFieldsAllowed?.includes(col.uniqueName)}
         isSelected={frameSelection ? false : cellIsSelected(rowIndex, col.colIndex, selectedCells)}
         isFrameSelected={frameSelection ? cellIsSelected(rowIndex, col.colIndex, selectedCells) : false}
         isAutofillSelected={cellIsSelected(rowIndex, col.colIndex, autofillSelectedCells)}
diff --git a/packages/web/src/formview/FormView.svelte b/packages/web/src/formview/FormView.svelte
index 1f7013a14..6ea7882e0 100644
--- a/packages/web/src/formview/FormView.svelte
+++ b/packages/web/src/formview/FormView.svelte
@@ -477,6 +477,7 @@
               colIndex={chunkIndex * 2 + 1}
               isSelected={currentCell[0] == rowIndex && currentCell[1] == chunkIndex * 2 + 1}
               isModifiedCell={rowStatus.modifiedFields && rowStatus.modifiedFields.has(col.uniqueName)}
+              allowHintField={!(rowStatus.modifiedFields && rowStatus.modifiedFields.has(col.uniqueName))}
               bind:domCell={domCells[`${rowIndex},${chunkIndex * 2 + 1}`]}
               onSetFormView={handleSetFormView}
               hideContent={!rowData ||
diff --git a/packages/web/src/settings/SettingsModal.svelte b/packages/web/src/settings/SettingsModal.svelte
index fd14956fc..e841341fb 100644
--- a/packages/web/src/settings/SettingsModal.svelte
+++ b/packages/web/src/settings/SettingsModal.svelte
@@ -39,7 +39,7 @@
     <FormCheckboxField name="dataGrid.hideLeftColumn" label="Hide left column by default" />
     <FormTextField
       name="dataGrid.pageSize"
-      label="Page size (number of rows for incremental loading)"
+      label="Page size (number of rows for incremental loading, must be between 5 and 1000)"
       defaultValue="100"
     />
     <FormCheckboxField name="dataGrid.showHintColumns" label="Show foreign key hints" defaultValue={true} />