diff --git a/packages/panel/src/components/Panel.svelte b/packages/panel/src/components/Panel.svelte
index 0ab7be5271..977a6330e9 100644
--- a/packages/panel/src/components/Panel.svelte
+++ b/packages/panel/src/components/Panel.svelte
@@ -65,15 +65,15 @@
   const startScrollHeightCheck = () => {
     clearTimeout(timer)
     timer = setTimeout(() => {
-      if (scroll == null) {
+      if (content == null) {
         return
       }
-      if (content !== undefined && lastScrollHeight <= content?.scrollHeight && count <= waitCount) {
+      if (lastScrollHeight <= content?.scrollHeight && count <= waitCount) {
         count = lastScrollHeight < content.scrollHeight ? 0 : count + 1
         lastScrollHeight = content.scrollHeight
 
         startScrollHeightCheck()
-      } else if (content !== undefined) {
+      } else {
         lastScrollHeight = -1
         count = 0
 
diff --git a/packages/text-editor/src/components/CollaboratorEditor.svelte b/packages/text-editor/src/components/CollaboratorEditor.svelte
index bb77d677aa..e617f12ea2 100644
--- a/packages/text-editor/src/components/CollaboratorEditor.svelte
+++ b/packages/text-editor/src/components/CollaboratorEditor.svelte
@@ -64,7 +64,7 @@
 
   export let field: string | undefined = undefined
 
-  export let autoOverflow = false
+  export let overflow: 'auto' | 'none' = 'auto'
   export let initialContent: string | undefined = undefined
   export let textNodeActions: TextNodeAction[] = []
   export let editorAttributes: { [name: string]: string } = {}
@@ -347,7 +347,7 @@
 
 {#if visible}
   {#if comparedVersion !== undefined || $$slots.tools}
-    <div class="ref-container" class:autoOverflow>
+    <div class="ref-container" style:overflow>
       {#if comparedVersion !== undefined}
         <div class="flex-row-center buttons-group xsmall-gap">
           <StyleButton
@@ -394,7 +394,7 @@
     />
   </div>
 
-  <div class="ref-container" class:autoOverflow>
+  <div class="ref-container" style:overflow>
     <div class="text-input" class:focusable>
       <div class="select-text" style="width: 100%;" bind:this={element} />
     </div>
@@ -402,10 +402,6 @@
 {/if}
 
 <style lang="scss">
-  .autoOverflow {
-    overflow: auto;
-  }
-
   .ref-container .formatPanel {
     margin: -0.5rem -0.25rem 0.5rem;
     padding: 0.375rem;
diff --git a/packages/theme/styles/_text-editor.scss b/packages/theme/styles/_text-editor.scss
index 7990bc85c3..10773bbbcf 100644
--- a/packages/theme/styles/_text-editor.scss
+++ b/packages/theme/styles/_text-editor.scss
@@ -8,7 +8,7 @@
 }
 
 .text-editor-view {
-  overflow-y: auto;
+  // overflow-y: auto;
   color: var(--theme-text-primary-color);
 
   .title,