diff --git a/packages/web/src/datagrid/DataGridCore.js b/packages/web/src/datagrid/DataGridCore.js
index d68ccb131..d9823e5b5 100644
--- a/packages/web/src/datagrid/DataGridCore.js
+++ b/packages/web/src/datagrid/DataGridCore.js
@@ -300,6 +300,16 @@ export default function DataGridCore(props) {
     return `Rows: ${allRowCount.toLocaleString()}`;
   }, [selectedCells, allRowCount, grider, visibleRealColumns]);
 
+  const handleSetFormView = React.useMemo(
+    () =>
+      formViewAvailable && display.baseTable && display.baseTable.primaryKey
+        ? (rowData) => {
+            display.switchToFormView(rowData);
+          }
+        : null,
+    [formViewAvailable, display]
+  );
+
   if (!columns || columns.length == 0) return <LoadingInfo wrapper message="Waiting for structure" />;
 
   if (errorMessage) {
@@ -949,13 +959,6 @@ export default function DataGridCore(props) {
     display.clearFilters();
   };
 
-  const handleSetFormView =
-    formViewAvailable && display.baseTable && display.baseTable.primaryKey
-      ? (rowData) => {
-          display.switchToFormView(rowData);
-        }
-      : null;
-
   const handleSwitchToFormView =
     formViewAvailable && display.baseTable && display.baseTable.primaryKey
       ? () => {