diff --git a/lib/widgets/editor.dart b/lib/widgets/editor.dart
index f6dd8e40..662a018c 100644
--- a/lib/widgets/editor.dart
+++ b/lib/widgets/editor.dart
@@ -1043,7 +1043,6 @@ class RenderEditableContainerBox extends RenderBox
 
   @override
   void performLayout() {
-    assert(!constraints.hasBoundedHeight);
     assert(constraints.hasBoundedWidth);
     _resolvePadding();
     assert(_resolvedPadding != null);
diff --git a/lib/widgets/raw_editor.dart b/lib/widgets/raw_editor.dart
index f93eabe2..4df93a4d 100644
--- a/lib/widgets/raw_editor.dart
+++ b/lib/widgets/raw_editor.dart
@@ -1008,25 +1008,28 @@ class RawEditorState extends EditorState
 
     _showCaretOnScreenScheduled = true;
     SchedulerBinding.instance!.addPostFrameCallback((_) {
-      _showCaretOnScreenScheduled = false;
+      if (widget.scrollable) {
+        _showCaretOnScreenScheduled = false;
 
-      final viewport = RenderAbstractViewport.of(getRenderEditor())!;
-      final editorOffset = getRenderEditor()!
-          .localToGlobal(const Offset(0, 0), ancestor: viewport);
-      final offsetInViewport = _scrollController!.offset + editorOffset.dy;
+        final viewport = RenderAbstractViewport.of(getRenderEditor());
 
-      final offset = getRenderEditor()!.getOffsetToRevealCursor(
-        _scrollController!.position.viewportDimension,
-        _scrollController!.offset,
-        offsetInViewport,
-      );
+        final editorOffset = getRenderEditor()!
+            .localToGlobal(const Offset(0, 0), ancestor: viewport);
+        final offsetInViewport = _scrollController!.offset + editorOffset.dy;
 
-      if (offset != null) {
-        _scrollController!.animateTo(
-          offset,
-          duration: const Duration(milliseconds: 100),
-          curve: Curves.fastOutSlowIn,
+        final offset = getRenderEditor()!.getOffsetToRevealCursor(
+          _scrollController!.position.viewportDimension,
+          _scrollController!.offset,
+          offsetInViewport,
         );
+
+        if (offset != null) {
+          _scrollController!.animateTo(
+            offset,
+            duration: const Duration(milliseconds: 100),
+            curve: Curves.fastOutSlowIn,
+          );
+        }
       }
     });
   }