2 files changed, 2 insertions, 1 deletions
diff --git a/src/ui/controls/TextBox.cpp b/src/ui/controls/TextBox.cpp
index 031894c0..0d14dbcf 100644
--- a/src/ui/controls/TextBox.cpp
+++ b/src/ui/controls/TextBox.cpp
@@ -32,7 +32,6 @@ TextBox::TextBox()
 
   service_ = std::make_unique<TextControlService<TextBox>>(this);
   service_->SetEnabled(true);
-  service_->SetCaretVisible(true);
   service_->SetEditable(true);
 
   border_render_object_->SetBorderEnabled(true);
diff --git a/src/ui/controls/TextControlService.hpp b/src/ui/controls/TextControlService.hpp
index d50621ea..c535512f 100644
--- a/src/ui/controls/TextControlService.hpp
+++ b/src/ui/controls/TextControlService.hpp
@@ -473,6 +473,7 @@ class TextControlService : public Object {
         input_method_context_event_guard_ +=
             window_host->AfterLayoutEvent()->AddHandler(
                 [this](auto) { this->UpdateInputMethodPosition(); });
+      SetCaretVisible(true);
     }
   }
 
@@ -483,6 +484,7 @@ class TextControlService : public Object {
     if (input_method_context) {
       input_method_context->DisableIME();
     }
+    SetCaretVisible(false);
     SyncTextRenderObject();
   }