diff --git a/src/managers/input/InputMethodRelay.cpp b/src/managers/input/InputMethodRelay.cpp
index f84850dee..267e90e54 100644
--- a/src/managers/input/InputMethodRelay.cpp
+++ b/src/managers/input/InputMethodRelay.cpp
@@ -45,10 +45,14 @@ void CInputMethodRelay::onNewIME(wlr_input_method_v2* pIME) {
                 wlr_text_input_v3_send_done(PTI->pWlrInput);
             } else {
                 if (PIMR->m_pWLRIME->current.preedit.text) {
-                    zwp_text_input_v1_send_preedit_cursor(PTI->pV1Input->resourceImpl, 0);
+                    zwp_text_input_v1_send_preedit_cursor(PTI->pV1Input->resourceImpl, PIMR->m_pWLRIME->current.preedit.cursor_begin);
                     zwp_text_input_v1_send_preedit_styling(PTI->pV1Input->resourceImpl, 0, std::string(PIMR->m_pWLRIME->current.preedit.text).length() - 1,
-                                                           ZWP_TEXT_INPUT_V1_PREEDIT_STYLE_ACTIVE);
+                                                           ZWP_TEXT_INPUT_V1_PREEDIT_STYLE_NONE);
                     zwp_text_input_v1_send_preedit_string(PTI->pV1Input->resourceImpl, PTI->pV1Input->serial, PIMR->m_pWLRIME->current.preedit.text, "");
+                } else {
+                    zwp_text_input_v1_send_preedit_cursor(PTI->pV1Input->resourceImpl, PIMR->m_pWLRIME->current.preedit.cursor_begin);
+                    zwp_text_input_v1_send_preedit_styling(PTI->pV1Input->resourceImpl, 0, 0, ZWP_TEXT_INPUT_V1_PREEDIT_STYLE_NONE);
+                    zwp_text_input_v1_send_preedit_string(PTI->pV1Input->resourceImpl, PTI->pV1Input->serial, "", "");
                 }
 
                 if (PIMR->m_pWLRIME->current.commit_text) {
@@ -56,8 +60,9 @@ void CInputMethodRelay::onNewIME(wlr_input_method_v2* pIME) {
                 }
 
                 if (PIMR->m_pWLRIME->current.delete_.before_length || PIMR->m_pWLRIME->current.delete_.after_length) {
-                    zwp_text_input_v1_send_delete_surrounding_text(PTI->pV1Input->resourceImpl, PIMR->m_pWLRIME->current.delete_.before_length,
-                                                                   PIMR->m_pWLRIME->current.delete_.after_length);
+                    zwp_text_input_v1_send_delete_surrounding_text(PTI->pV1Input->resourceImpl,
+                                                                   std::string(PIMR->m_pWLRIME->current.preedit.text).length() - PIMR->m_pWLRIME->current.delete_.before_length,
+                                                                   PIMR->m_pWLRIME->current.delete_.after_length + PIMR->m_pWLRIME->current.delete_.before_length);
 
                     if (PIMR->m_pWLRIME->current.preedit.text)
                         zwp_text_input_v1_send_commit_string(PTI->pV1Input->resourceImpl, PTI->pV1Input->serial, PIMR->m_pWLRIME->current.preedit.text);
diff --git a/src/protocols/TextInputV1.cpp b/src/protocols/TextInputV1.cpp
index 341ce27b9..71e11ea73 100644
--- a/src/protocols/TextInputV1.cpp
+++ b/src/protocols/TextInputV1.cpp
@@ -133,10 +133,9 @@ static void destroyTI(wl_resource* resource) {
         wl_resource_set_user_data(resource, nullptr);
     }
 
-    g_pInputManager->m_sIMERelay.removeTextInput(TI->pTextInput);
-
     TI->pTextInput->hyprListener_textInputDestroy.emit(nullptr);
 
+    g_pInputManager->m_sIMERelay.removeTextInput(TI->pTextInput);
     g_pProtocolManager->m_pTextInputV1ProtocolManager->removeTI(TI);
 }