diff --git a/lib/widgets/controller.dart b/lib/widgets/controller.dart
index 4bfc5a4f..7c419d0c 100644
--- a/lib/widgets/controller.dart
+++ b/lib/widgets/controller.dart
@@ -44,23 +44,24 @@ class QuillController extends ChangeNotifier {
 
   void undo() {
     if (document.undo()) {
-      if (this.selection.extentOffset >= document.length) {
-        updateSelection(TextSelection.collapsed(offset: document.length),
-            ChangeSource.LOCAL);
-      } else {
-        notifyListeners();
-      }
+      _handleHistoryChange();
+    }
+  }
+
+  void _handleHistoryChange() {
+    if (this.selection.extentOffset >= document.length) {
+      // cursor exceeds the length of document, position it in the end
+      updateSelection(
+          TextSelection.collapsed(offset: document.length), ChangeSource.LOCAL);
+    } else {
+      // no need to move cursor
+      notifyListeners();
     }
   }
 
   void redo() {
     if (document.redo()) {
-      if (this.selection.extentOffset >= document.length) {
-        updateSelection(TextSelection.collapsed(offset: document.length),
-            ChangeSource.LOCAL);
-      } else {
-        notifyListeners();
-      }
+      _handleHistoryChange();
     }
   }