diff --git a/packages/web/src/commands/registerCommand.ts b/packages/web/src/commands/registerCommand.ts
index 7dc3bf59f..7d3c99909 100644
--- a/packages/web/src/commands/registerCommand.ts
+++ b/packages/web/src/commands/registerCommand.ts
@@ -9,7 +9,7 @@ export interface GlobalCommand {
   id: string;
   category: string;
   name: string;
-  text: string /* category: name */;
+  text?: string /* category: name */;
   keyText?: string;
   getSubCommands?: () => SubCommand[];
   onClick?: Function;
diff --git a/packages/web/src/datagrid/DataGridCore.svelte b/packages/web/src/datagrid/DataGridCore.svelte
index 74a3b7cd3..a60e3350a 100644
--- a/packages/web/src/datagrid/DataGridCore.svelte
+++ b/packages/web/src/datagrid/DataGridCore.svelte
@@ -15,6 +15,7 @@
 
 <script lang="ts">
   import { GridDisplay } from 'dbgate-datalib';
+  import { get_current_component } from 'svelte/internal';
   import _ from 'lodash';
   import { writable, get, derived } from 'svelte/store';
   import registerCommand from '../commands/registerCommand';
@@ -37,9 +38,9 @@
   export let conid = undefined;
   export let database = undefined;
   export let frameSelection = undefined;
-  export let instance = undefined;
 
   const wheelRowCount = 5;
+  const instance = get_current_component();
 
   let containerHeight = 0;
   let containerWidth = 0;
diff --git a/packages/web/src/datagrid/LoadingDataGridCore.svelte b/packages/web/src/datagrid/LoadingDataGridCore.svelte
index 65338f9dc..50969ef75 100644
--- a/packages/web/src/datagrid/LoadingDataGridCore.svelte
+++ b/packages/web/src/datagrid/LoadingDataGridCore.svelte
@@ -15,7 +15,6 @@
   let allRowCount = null;
   let errorMessage = null;
   let loadNextDataToken = 0;
-  let domComponent;
 
   async function loadNextData() {
     if (isLoading) return;
@@ -87,6 +86,4 @@
   {...$$props}
   loadNextData={handleLoadNextData}
   {grider}
-  bind:this={domComponent}
-  instance={domComponent}
 />