diff --git a/lib/widgets/raw_editor.dart b/lib/widgets/raw_editor.dart
index d6d4122e..c3f47320 100644
--- a/lib/widgets/raw_editor.dart
+++ b/lib/widgets/raw_editor.dart
@@ -564,14 +564,15 @@ class RawEditorState extends EditorState
     final result = <Widget>[];
     for (Node node in widget.controller.document.root.children) {
       if (node is Line) {
-        result.add(EditableTextLine(
+        TextLine textLine = TextLine(
+          line: node,
+          textDirection: _textDirection,
+          embedBuilder: widget.embedBuilder,
+        );
+        EditableTextLine editableTextLine = EditableTextLine(
             node,
             null,
-            TextLine(
-              line: node,
-              textDirection: _textDirection,
-              embedBuilder: widget.embedBuilder,
-            ),
+            textLine,
             0,
             _getVerticalSpacingForLine(node, _styles),
             _textDirection,
@@ -580,7 +581,8 @@ class RawEditorState extends EditorState
             widget.enableInteractiveSelection,
             _hasFocus,
             MediaQuery.of(context).devicePixelRatio,
-            _cursorCont));
+            _cursorCont);
+        result.add(editableTextLine);
       } else if (node is Block) {
         Map<String, Attribute> attrs = node.style.attributes;
         result.add(EditableTextBlock(
diff --git a/lib/widgets/text_line.dart b/lib/widgets/text_line.dart
index 2170c73b..562e9d38 100644
--- a/lib/widgets/text_line.dart
+++ b/lib/widgets/text_line.dart
@@ -42,13 +42,14 @@ class TextLine extends StatelessWidget {
     TextSpan textSpan = _buildTextSpan(context);
     StrutStyle strutStyle =
         StrutStyle.fromTextStyle(textSpan.style, forceStrutHeight: true);
+    RichText child = RichText(
+      text: _buildTextSpan(context),
+      textDirection: textDirection,
+      strutStyle: strutStyle,
+      textScaleFactor: MediaQuery.textScaleFactorOf(context),
+    );
     return RichTextProxy(
-        RichText(
-          text: _buildTextSpan(context),
-          textDirection: textDirection,
-          strutStyle: strutStyle,
-          textScaleFactor: MediaQuery.textScaleFactorOf(context),
-        ),
+        child,
         textSpan.style,
         textDirection,
         1.0,