diff --git a/src/managers/input/InputMethodRelay.cpp b/src/managers/input/InputMethodRelay.cpp
index 15dd249e7..6ee3c8366 100644
--- a/src/managers/input/InputMethodRelay.cpp
+++ b/src/managers/input/InputMethodRelay.cpp
@@ -75,6 +75,11 @@ CTextInput* CInputMethodRelay::getFocusedTextInput() {
     if (!Desktop::focusState()->surface())
         return nullptr;
 
+    for (auto const& ti : m_textInputs) {
+        if (ti->focusedSurface() == Desktop::focusState()->surface() && ti->isEnabled())
+            return ti.get();
+    }
+
     for (auto const& ti : m_textInputs) {
         if (ti->focusedSurface() == Desktop::focusState()->surface())
             return ti.get();
diff --git a/src/managers/input/TextInput.cpp b/src/managers/input/TextInput.cpp
index 4475b5ee8..404201294 100644
--- a/src/managers/input/TextInput.cpp
+++ b/src/managers/input/TextInput.cpp
@@ -305,3 +305,7 @@ bool CTextInput::hasCursorRectangle() {
 CBox CTextInput::cursorBox() {
     return CBox{isV3() ? m_v3Input->m_current.box.cursorBox : m_v1Input->m_cursorRectangle};
 }
+
+bool CTextInput::isEnabled() {
+    return isV3() ? m_v3Input->m_current.enabled.value : true;
+}
diff --git a/src/managers/input/TextInput.hpp b/src/managers/input/TextInput.hpp
index fd24dbfa4..acb38d582 100644
--- a/src/managers/input/TextInput.hpp
+++ b/src/managers/input/TextInput.hpp
@@ -29,6 +29,7 @@ class CTextInput {
     void                   onCommit();
     void                   onReset();
 
+    bool                   isEnabled();
     bool                   hasCursorRectangle();
     CBox                   cursorBox();