diff --git a/packages/text-editor/src/components/StyledTextEditor.svelte b/packages/text-editor/src/components/StyledTextEditor.svelte
index cc1693c70f..12622db786 100644
--- a/packages/text-editor/src/components/StyledTextEditor.svelte
+++ b/packages/text-editor/src/components/StyledTextEditor.svelte
@@ -561,9 +561,11 @@
         }
       }
     }
-    .formatPanel {
+    &:focus-within .formatPanel {
       position: sticky;
       top: 1.25rem;
+    }
+    .formatPanel {
       margin: -0.5rem -0.25rem 0.5rem;
       padding: 0.375rem;
       background-color: var(--body-accent);
diff --git a/packages/ui/src/components/ExpandCollapse.svelte b/packages/ui/src/components/ExpandCollapse.svelte
index edb6375679..1ffcd64d1f 100644
--- a/packages/ui/src/components/ExpandCollapse.svelte
+++ b/packages/ui/src/components/ExpandCollapse.svelte
@@ -31,7 +31,11 @@
   $: tweenedHeight.set(isExpanded ? height : 0, { duration, easing })
 </script>
 
-<div class="root" style="height: {$tweenedHeight}px" style:overflow={isExpanded ? 'visible' : 'hidden'}>
+<div
+  class="root"
+  style="height: {$tweenedHeight}px;"
+  style:overflow={$tweenedHeight < height ? 'auto' : $tweenedHeight === 0 ? 'hidden' : 'visible'}
+>
   <div bind:offsetHeight={height} class="flex-no-shrink clear-mins">
     <slot />
   </div>