1 files changed, 8 insertions, 4 deletions
diff --git a/src/plugins/platforms/android/qandroidinputcontext.cpp b/src/plugins/platforms/android/qandroidinputcontext.cpp
index abda72e636..a23d05520c 100644
--- a/src/plugins/platforms/android/qandroidinputcontext.cpp
+++ b/src/plugins/platforms/android/qandroidinputcontext.cpp
@@ -441,10 +441,14 @@ void QAndroidInputContext::reset()
 {
     clear();
     m_batchEditNestingLevel = 0;
-    if (qGuiApp->focusObject())
-        QtAndroidInput::resetSoftwareKeyboard();
-    else
-        QtAndroidInput::hideSoftwareKeyboard();
+    if (qGuiApp->focusObject()) {
+        QSharedPointer<QInputMethodQueryEvent> query = focusObjectInputMethodQueryThreadSafe(Qt::ImEnabled);
+        if (!query.isNull() && query->value(Qt::ImEnabled).toBool()) {
+            QtAndroidInput::resetSoftwareKeyboard();
+            return;
+        }
+    }
+    QtAndroidInput::hideSoftwareKeyboard();
 }
 
 void QAndroidInputContext::commit()