diff --git a/lib/src/models/documents/document.dart b/lib/src/models/documents/document.dart
index d3c2e5eb..85d91dca 100644
--- a/lib/src/models/documents/document.dart
+++ b/lib/src/models/documents/document.dart
@@ -219,7 +219,7 @@ class Document {
     if (res.node is Line) {
       return res;
     }
-    final block = res.node as Block;
+    final block = res.node as Block; // TODO: Can be nullable, handle this case
     return block.queryChild(res.offset, true);
   }
 
diff --git a/lib/src/widgets/quill/C b/lib/src/widgets/quill/C
new file mode 100644
index 00000000..e69de29b
diff --git a/lib/src/widgets/quill/quill_controller.dart b/lib/src/widgets/quill/quill_controller.dart
index 7ea7b9fc..c60083fe 100644
--- a/lib/src/widgets/quill/quill_controller.dart
+++ b/lib/src/widgets/quill/quill_controller.dart
@@ -251,8 +251,13 @@ class QuillController extends ChangeNotifier {
       // updateSelection(
       // TextSelection.collapsed(offset: document.length), ChangeSource.LOCAL);
       updateSelection(
-          TextSelection.collapsed(offset: selection.baseOffset + len),
-          ChangeSource.local);
+        (selection.baseOffset + len) > 0
+            ? TextSelection.collapsed(
+                offset: selection.baseOffset + len,
+              )
+            : TextSelection.collapsed(offset: document.length),
+        ChangeSource.local,
+      );
     } else {
       // no need to move cursor
       notifyListeners();