diff --git a/app/client/src/components/designSystems/appsmith/TableStyledWrappers.tsx b/app/client/src/components/designSystems/appsmith/TableStyledWrappers.tsx
index 9ab7df05ba..54bcf7d398 100644
--- a/app/client/src/components/designSystems/appsmith/TableStyledWrappers.tsx
+++ b/app/client/src/components/designSystems/appsmith/TableStyledWrappers.tsx
@@ -29,6 +29,8 @@ export const TableWrapper = styled.div<{
     color: ${Colors.THUNDER};
     position: relative;
     background: ${Colors.ATHENS_GRAY_DARKER};
+    display: table;
+    width: 100%;
     .thead,
     .tbody {
       overflow: hidden;
diff --git a/app/client/src/pages/Editor/QueryEditor/Table.tsx b/app/client/src/pages/Editor/QueryEditor/Table.tsx
index b203296947..7f771b0e17 100644
--- a/app/client/src/pages/Editor/QueryEditor/Table.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/Table.tsx
@@ -15,7 +15,7 @@ interface TableProps {
 
 const StyledTableWrapped = styled(TableWrapper)`
   min-height: 0px;
-  height: auto;
+  height: 100%;
   .tableWrap {
     display: flex;
     flex: 1;
@@ -24,9 +24,11 @@ const StyledTableWrapped = styled(TableWrapper)`
     display: flex;
     flex: 1;
     flex-direction: column;
-    height: auto;
+    height: 100%;
+    display: table;
+    width: 100%;
     .tbody {
-      height: auto;
+      height: 100%;
       overflow: auto;
     }
   }