diff --git a/lib/widgets/controller.dart b/lib/widgets/controller.dart
index 83a27bbc..4bfc5a4f 100644
--- a/lib/widgets/controller.dart
+++ b/lib/widgets/controller.dart
@@ -44,13 +44,23 @@ class QuillController extends ChangeNotifier {
 
   void undo() {
     if (document.undo()) {
-      notifyListeners();
+      if (this.selection.extentOffset >= document.length) {
+        updateSelection(TextSelection.collapsed(offset: document.length),
+            ChangeSource.LOCAL);
+      } else {
+        notifyListeners();
+      }
     }
   }
 
   void redo() {
     if (document.redo()) {
-      notifyListeners();
+      if (this.selection.extentOffset >= document.length) {
+        updateSelection(TextSelection.collapsed(offset: document.length),
+            ChangeSource.LOCAL);
+      } else {
+        notifyListeners();
+      }
     }
   }