diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue
index ca027e2662..b4da5c9d90 100644
--- a/apps/desktop/src/components/grid/DataGrid.vue
+++ b/apps/desktop/src/components/grid/DataGrid.vue
@@ -1987,6 +1987,7 @@ const editor = useDataGridEditor({
   sql: computed(() => props.sql),
   searchText,
   whereFilterInput,
+  currentWhereInput: computed(() => currentWhereInput()),
   orderByInput,
   rowStatusFilter,
   initialEditColumn: firstVisibleColumnIndex,
@@ -2101,7 +2102,7 @@ async function onToolbarRefresh() {
     "reload",
     props.sql,
     searchText.value,
-    whereFilterInput.value.trim() || undefined,
+    currentWhereInput(),
     currentOrderBy(),
     pageSize.value,
     (currentPage.value - 1) * pageSize.value,
@@ -2119,7 +2120,7 @@ function onToolbarRollback() {
     "reload",
     props.sql,
     searchText.value,
-    whereFilterInput.value.trim() || undefined,
+    currentWhereInput(),
     currentOrderBy(),
     pageSize.value,
     (currentPage.value - 1) * pageSize.value,
diff --git a/apps/desktop/src/composables/useDataGridEditor.ts b/apps/desktop/src/composables/useDataGridEditor.ts
index 646006ccd6..46d43ebc46 100644
--- a/apps/desktop/src/composables/useDataGridEditor.ts
+++ b/apps/desktop/src/composables/useDataGridEditor.ts
@@ -61,6 +61,7 @@ export interface UseDataGridEditorOptions {
   sql: ComputedRef<string | undefined>;
   searchText: Ref<string>;
   whereFilterInput: Ref<string>;
+  currentWhereInput: ComputedRef<string | undefined>;
   orderByInput: Ref<string>;
   rowStatusFilter: Ref<RowStatusFilter>;
   initialEditColumn?: ComputedRef<number>;
@@ -107,7 +108,6 @@ export function useDataGridEditor(options: UseDataGridEditorOptions) {
     customSave,
     sql,
     searchText,
-    whereFilterInput,
     orderByInput,
     rowStatusFilter,
     initialEditColumn,
@@ -633,7 +633,7 @@ export function useDataGridEditor(options: UseDataGridEditorOptions) {
       "reload",
       sql.value,
       searchText.value,
-      whereFilterInput.value.trim() || undefined,
+      options.currentWhereInput.value,
       orderByInput.value.trim() || undefined,
       pageSize.value,
       (currentPage.value - 1) * pageSize.value,