1 files changed, 3 insertions, 9 deletions
diff --git a/src/ui/controls/TextControlService.hpp b/src/ui/controls/TextControlService.hpp
index 04807c30..376f9177 100644
--- a/src/ui/controls/TextControlService.hpp
+++ b/src/ui/controls/TextControlService.hpp
@@ -206,16 +206,12 @@ class TextControlService : public Object {
     SetSelection(GetSelection().GetStart() + text.size());
   }
 
-  void ScrollToCaret(bool next_tick = true) {
-    if (next_tick) {
-      scroll_to_caret_timer_canceler_.Reset(
-          GetUiApplication()->GetInstance()->SetImmediate(
-              [this]() { this->ScrollToCaret(false); }));
-    } else {
+  void ScrollToCaret() {
+    this->control_->GetUiHost()->RunAfterLayoutStable([this]() {
       const auto caret_rect = this->GetTextRenderObject()->GetCaretRect();
       this->GetScrollRenderObject()->ScrollToContain(caret_rect,
                                                      Thickness{5.f});
-    }
+    });
   }
 
  private:
@@ -453,8 +449,6 @@ class TextControlService : public Object {
 
   ShortcutHub shortcut_hub_;
 
-  platform::native::TimerAutoCanceler scroll_to_caret_timer_canceler_;
-
   // nullopt means not selecting
   std::optional<MouseButton> select_down_button_;