diff --git a/packages/web/src/datagrid/DataGridCell.svelte b/packages/web/src/datagrid/DataGridCell.svelte
index cee232ce9..0457dee7c 100644
--- a/packages/web/src/datagrid/DataGridCell.svelte
+++ b/packages/web/src/datagrid/DataGridCell.svelte
@@ -39,6 +39,7 @@
   export let hideContent = false;
   export let onSetFormView;
   export let isDynamicStructure = false;
+  export let isAutoFillMarker = false;
 
   $: value = col.isStructured ? _.get(rowData || {}, col.uniquePath) : (rowData || {})[col.uniqueName];
 </script>
@@ -114,6 +115,10 @@
       <ShowFormButton on:click={() => onSetFormView(rowData, col)} />
     {/if}
   {/if}
+
+  {#if isAutoFillMarker}
+    <div class="autoFillMarker autofillHandleMarker" />
+  {/if}
 </td>
 
 <!-- {#if _.isArray(value.data)}
@@ -175,4 +180,15 @@
   .value {
     color: var(--theme-icon-green);
   }
+
+  .autoFillMarker {
+    width: 8px;
+    height: 8px;
+    background: var(--theme-bg-selected-point);
+    position: absolute;
+    right: 0px;
+    bottom: 0px;
+    overflow: visible;
+    cursor: crosshair;
+  }
 </style>
diff --git a/packages/web/src/datagrid/DataGridRow.svelte b/packages/web/src/datagrid/DataGridRow.svelte
index 36e8b4254..f89def160 100644
--- a/packages/web/src/datagrid/DataGridRow.svelte
+++ b/packages/web/src/datagrid/DataGridRow.svelte
@@ -64,6 +64,9 @@
           (rowStatus.deletedFields && rowStatus.deletedFields.has(col.uniqueName))}
         {onSetFormView}
         {isDynamicStructure}
+        isAutoFillMarker={autofillMarkerCell &&
+          autofillMarkerCell[1] == col.colIndex &&
+          autofillMarkerCell[0] == rowIndex}
       />
     {/if}
   {/each}
diff --git a/packages/web/src/plugins/ThemeDark.svelte b/packages/web/src/plugins/ThemeDark.svelte
index 8dd93c74a..083ab7536 100644
--- a/packages/web/src/plugins/ThemeDark.svelte
+++ b/packages/web/src/plugins/ThemeDark.svelte
@@ -50,6 +50,7 @@
 
     --theme-bg-hover: #112a45;
     --theme-bg-selected: #15395b; /* blue-3 */
+    --theme-bg-selected-point: #1765ad; /* blue-5 */
 
     --theme-bg-statusbar-inv: blue;
     --theme-bg-modalheader: rgb(43, 60, 61);
diff --git a/packages/web/src/plugins/ThemeLight.svelte b/packages/web/src/plugins/ThemeLight.svelte
index a39cfbace..b3668b6a4 100644
--- a/packages/web/src/plugins/ThemeLight.svelte
+++ b/packages/web/src/plugins/ThemeLight.svelte
@@ -43,6 +43,8 @@
 
     --theme-bg-hover: #bae7ff;
     --theme-bg-selected: #91d5ff; /* blue-3 */
+    --theme-bg-selected-point: #40a9ff; /* blue-5 */
+    
 
     --theme-bg-statusbar-inv: blue;
     --theme-bg-modalheader: #eff;