diff --git a/packages/web/src/datagrid/DataGridCore.svelte b/packages/web/src/datagrid/DataGridCore.svelte
index a12739ae3..4703e1acf 100644
--- a/packages/web/src/datagrid/DataGridCore.svelte
+++ b/packages/web/src/datagrid/DataGridCore.svelte
@@ -1163,6 +1163,8 @@
     if (event.target.closest('.collapseButtonMarker')) return;
     if (event.target.closest('.showFormButtonMarker')) return;
     if (event.target.closest('.inplaceeditor-container')) return;
+    if (event.target.closest('input')) return;
+
 
     shiftDragStartCell = null;
     // event.target.closest('table').focus();
diff --git a/packages/web/src/elements/TabControl.svelte b/packages/web/src/elements/TabControl.svelte
index f6e09b1ee..2d80e6a9e 100644
--- a/packages/web/src/elements/TabControl.svelte
+++ b/packages/web/src/elements/TabControl.svelte
@@ -62,6 +62,7 @@
   .main {
     display: flex;
     flex-direction: column;
+    overflow: auto;
   }
 
   .main.flex1 {