diff --git a/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx b/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx
index 4179757d80..aa3f1f161f 100644
--- a/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx
+++ b/app/client/src/components/editorComponents/Debugger/DebuggerLogs.tsx
@@ -26,6 +26,7 @@ import { getDebuggerSelectedFilter } from "selectors/debuggerSelectors";
 import { setDebuggerSelectedFilter } from "actions/debuggerActions";
 
 export const LIST_HEADER_HEIGHT = "38px";
+export const FOOTER_MARGIN = "40px";
 
 const ContainerWrapper = styled.div`
   overflow: hidden;
diff --git a/app/client/src/components/editorComponents/EntityBottomTabs.tsx b/app/client/src/components/editorComponents/EntityBottomTabs.tsx
index 81ff8e5bb8..28c16a544c 100644
--- a/app/client/src/components/editorComponents/EntityBottomTabs.tsx
+++ b/app/client/src/components/editorComponents/EntityBottomTabs.tsx
@@ -4,7 +4,7 @@ import AnalyticsUtil from "utils/AnalyticsUtil";
 import { DEBUGGER_TAB_KEYS } from "./Debugger/helpers";
 import { Tab, TabPanel, Tabs, TabsList } from "design-system";
 import styled from "styled-components";
-import { LIST_HEADER_HEIGHT } from "./Debugger/DebuggerLogs";
+import { LIST_HEADER_HEIGHT, FOOTER_MARGIN } from "./Debugger/DebuggerLogs";
 
 const TabPanelWrapper = styled(TabPanel)`
   margin-top: 0;
@@ -12,6 +12,12 @@ const TabPanelWrapper = styled(TabPanel)`
   &.ads-v2-tabs__panel {
     overflow: auto;
   }
+  & .t--code-editor-wrapper.codeWrapper {
+    height: calc(100% - ${FOOTER_MARGIN});
+    & .CodeMirror-scroll {
+      box-sizing: border-box;
+    }
+  }
 `;
 
 const TabsListWrapper = styled(TabsList)`