diff --git a/packages/react-code-editor/src/components/CodeEditor/CodeEditor.tsx b/packages/react-code-editor/src/components/CodeEditor/CodeEditor.tsx
index cfadb403965..d0483eb7217 100644
--- a/packages/react-code-editor/src/components/CodeEditor/CodeEditor.tsx
+++ b/packages/react-code-editor/src/components/CodeEditor/CodeEditor.tsx
@@ -385,7 +385,9 @@ export const CodeEditor = ({
     onEditorDidMount(editor, monaco);
     editorRef.current = editor;
     if (height === 'sizeToFit') {
-      setHeightToFitContent();
+      editor.onDidContentSizeChange(() => {
+        setHeightToFitContent();
+      });
     }
   };