diff --git a/resources/jscomposition/base/table/BaseTable.vue b/resources/jscomposition/base/table/BaseTable.vue
index 3b7b057f80..cb9cbc3ac9 100644
--- a/resources/jscomposition/base/table/BaseTable.vue
+++ b/resources/jscomposition/base/table/BaseTable.vue
@@ -1,7 +1,8 @@
 <template>
   <div
     class="tw-w-full tw-relative tw-text-gray-600 tw-text-sm
-      tw-border tw-rounded-xl tw-border-gray-300 tw-overflow-hidden tw-overflow-x-auto">
+      tw-border tw-rounded-xl tw-border-gray-300 tw-overflow-hidden tw-overflow-x-auto tw-overflow-y-auto"
+  >
     <table
       class="tw-w-full tw-border-collapse"
       :class="{
diff --git a/resources/jscomposition/cases/casesDetail/components/CompletedForms.vue b/resources/jscomposition/cases/casesDetail/components/CompletedForms.vue
index 5d728fffce..cc6adace3e 100644
--- a/resources/jscomposition/cases/casesDetail/components/CompletedForms.vue
+++ b/resources/jscomposition/cases/casesDetail/components/CompletedForms.vue
@@ -6,8 +6,8 @@
       :data="data"
       :config="config"
       :placeholder="showPlaceholder"
-      class="tw-flex tw-flex-col tw-grow tw-overflow-y-scroll"
-      @changeFilter="onChangeFilter">
+      @changeFilter="onChangeFilter"
+    >
       <template
         v-for="(item, index) in data"
         #[`container-row-${index}`]>
diff --git a/resources/jscomposition/cases/casesDetail/components/RequestTable.vue b/resources/jscomposition/cases/casesDetail/components/RequestTable.vue
index e1d6210def..cf4f8d60ce 100644
--- a/resources/jscomposition/cases/casesDetail/components/RequestTable.vue
+++ b/resources/jscomposition/cases/casesDetail/components/RequestTable.vue
@@ -1,13 +1,12 @@
 <template>
-  <div
-    class="tw-flex tw-flex-col tw-w-full tw-grow tw-py-3 tw-overflow-hidden tw-space-y-3">
+  <div class="tw-flex tw-flex-col tw-w-full tw-grow tw-py-3 tw-overflow-hidden tw-space-y-3">
     <SortTable
       id="task-table"
       :columns="columnsConfig"
       :data="data"
       :placeholder="showPlaceholder"
-      class="tw-flex tw-flex-col tw-grow tw-overflow-y-scroll"
-      @changeFilter="onChangeFilter">
+      @changeFilter="onChangeFilter"
+    >
       <template #placeholder>
         <TablePlaceholder
           :placeholder="placeholderType"
diff --git a/resources/jscomposition/cases/casesDetail/components/TaskTable.vue b/resources/jscomposition/cases/casesDetail/components/TaskTable.vue
index 7ab259167e..ed56cb338f 100644
--- a/resources/jscomposition/cases/casesDetail/components/TaskTable.vue
+++ b/resources/jscomposition/cases/casesDetail/components/TaskTable.vue
@@ -1,13 +1,12 @@
 <template>
-  <div
-    class="tw-flex tw-flex-col tw-w-full tw-grow tw-py-3 tw-overflow-hidden tw-space-y-3">
+  <div class="tw-flex tw-flex-col tw-w-full tw-grow tw-py-3 tw-overflow-hidden tw-space-y-3">
     <SortTable
       id="task-table"
       :columns="columnsConfig"
       :data="data"
       :placeholder="showPlaceholder"
-      class="tw-flex tw-flex-col tw-grow tw-overflow-y-scroll"
-      @changeFilter="onChangeFilter">
+      @changeFilter="onChangeFilter"
+    >
       <template #placeholder>
         <TablePlaceholder
           :placeholder="placeholderType"
diff --git a/resources/jscomposition/cases/casesMain/CasesDataSection.vue b/resources/jscomposition/cases/casesMain/CasesDataSection.vue
index 26cd351233..9a5fb7ac2a 100644
--- a/resources/jscomposition/cases/casesMain/CasesDataSection.vue
+++ b/resources/jscomposition/cases/casesMain/CasesDataSection.vue
@@ -10,7 +10,6 @@
       :columns="columnsConfig"
       :data="data"
       :placeholder="showPlaceholder"
-      class="tw-flex tw-flex-col tw-grow tw-overflow-y-scroll"
       @changeFilter="onChangeFilter"
     >
       <template #placeholder>
diff --git a/resources/jscomposition/system/table/FilterableTable.vue b/resources/jscomposition/system/table/FilterableTable.vue
index 217f3dcb01..4892974977 100644
--- a/resources/jscomposition/system/table/FilterableTable.vue
+++ b/resources/jscomposition/system/table/FilterableTable.vue
@@ -3,7 +3,8 @@
     :columns="columns"
     :data="data"
     :placeholder="placeholder"
-    class="tw-overflow-y-scroll">
+    class="tw-grow"
+  >
     <template
       v-for="(column, index) in columns"
       #[`theader-filter-${column.field}`]>
diff --git a/resources/jscomposition/system/table/SortTable.vue b/resources/jscomposition/system/table/SortTable.vue
index 0c5479ad8f..4ab4b61f88 100644
--- a/resources/jscomposition/system/table/SortTable.vue
+++ b/resources/jscomposition/system/table/SortTable.vue
@@ -5,7 +5,8 @@
     :data="data"
     :config="config"
     :placeholder="placeholder"
-    class="tw-grow tw-overflow-y-scroll">
+    class="tw-grow"
+  >
     <template
       v-for="(column, index) in columns"
       #[`theader-filter-${column.field}`]>