diff --git a/src/components/PythonCodeEditor.jsx b/src/components/PythonCodeEditor.jsx
index 130a8b74..9e3991d6 100644
--- a/src/components/PythonCodeEditor.jsx
+++ b/src/components/PythonCodeEditor.jsx
@@ -63,7 +63,27 @@ const PythonCodeEditor = ({
       </div>
       
       <div className="editor-container" style={{ height }}>
-        <CodeMirror value={code} onChange={handleCodeChange} extensions={[python({ python: true })]} theme={vscodeDark} options={{ fontSize: 24 }}/>
+        <CodeMirror 
+          value={code} 
+          onChange={handleCodeChange} 
+          extensions={[python({ python: true })]} 
+          theme={vscodeDark} 
+          basicSetup={{
+            lineNumbers: true,
+            foldGutter: true,
+            dropCursor: false,
+            allowMultipleSelections: false,
+            indentOnInput: true,
+            bracketMatching: true,
+            closeBrackets: true,
+            autocompletion: true,
+            highlightSelectionMatches: true,
+          }}
+          style={{
+            fontSize: '14px',
+            height: '100%',
+          }}
+        />
       </div>
 
       {executionResult && (
diff --git a/src/styles/PythonCodeEditor.css b/src/styles/PythonCodeEditor.css
index 00dbce9f..8a753e25 100644
--- a/src/styles/PythonCodeEditor.css
+++ b/src/styles/PythonCodeEditor.css
@@ -47,6 +47,22 @@
 .editor-container {
   border-radius: 0 0 8px 8px;
   overflow: hidden;
+  position: relative;
+}
+
+.editor-container .cm-editor {
+  height: 100% !important;
+  overflow: auto !important;
+}
+
+.editor-container .cm-scroller {
+  overflow: auto !important;
+  max-height: 100% !important;
+}
+
+.editor-container .cm-content {
+  padding: 8px 0;
+  min-height: 100% !important;
 }
 
 .execution-result {