diff --git a/packages/web/src/datagrid/CellValue.svelte b/packages/web/src/datagrid/CellValue.svelte
index 7b6bcb7a1..013a5ff99 100644
--- a/packages/web/src/datagrid/CellValue.svelte
+++ b/packages/web/src/datagrid/CellValue.svelte
@@ -7,6 +7,7 @@
   export let value;
   export let jsonParsedValue = undefined;
   export let editorTypes;
+  export let rightMargin = false;
 
   $: stringified = stringifyCellValue(
     value,
@@ -20,7 +21,7 @@
 {#if rowData == null}
   <span class="null">(No row)</span>
 {:else}
-  <span class={stringified.gridStyle} title={stringified.gridTitle}>{stringified.value}</span>
+  <span class={stringified.gridStyle} title={stringified.gridTitle} class:rightMargin>{stringified.value}</span>
 {/if}
 
 <style>
@@ -31,4 +32,8 @@
   .valueCellStyle {
     color: var(--theme-icon-green);
   }
+
+  .rightMargin {
+    margin-right: 16px;
+  }
 </style>
diff --git a/packages/web/src/datagrid/DataGridCell.svelte b/packages/web/src/datagrid/DataGridCell.svelte
index 27fd6d3ac..3ed072aeb 100644
--- a/packages/web/src/datagrid/DataGridCell.svelte
+++ b/packages/web/src/datagrid/DataGridCell.svelte
@@ -73,7 +73,13 @@
   class:alignRight={_.isNumber(value) && !showHint}
   {style}
 >
-  <CellValue {rowData} {value} {jsonParsedValue} {editorTypes} />
+  <CellValue
+    {rowData}
+    {value}
+    {jsonParsedValue}
+    {editorTypes}
+    rightMargin={_.isNumber(value) && !showHint && (editorTypes?.explicitDataType || col.foreignKey)}
+  />
 
   {#if showHint}
     <span class="hint"