diff --git a/src/QmlControls/QGCViewDialog.qml b/src/QmlControls/QGCViewDialog.qml
index 34dba11fa0eb5b7f56e26c7bde4b995c88cf8ae0..968afb91ce1cfb860498555a49be82ed375ed319 100644
--- a/src/QmlControls/QGCViewDialog.qml
+++ b/src/QmlControls/QGCViewDialog.qml
@@ -32,14 +32,12 @@ Item {
 
     function accept() {
         if (acceptAllowed) {
-            Qt.inputMethod.hide()
             hideDialog()
         }
     }
 
     function reject() {
         if (rejectAllowed) {
-            Qt.inputMethod.hide()
             hideDialog()
         }
     }
diff --git a/src/QmlControls/QGCViewDialogContainer.qml b/src/QmlControls/QGCViewDialogContainer.qml
index 7eb43ae2059d86c6b687bfbf79c98a0434b27789..bad30fcc0b31de621faff5a8086e1116c0e69193 100644
--- a/src/QmlControls/QGCViewDialogContainer.qml
+++ b/src/QmlControls/QGCViewDialogContainer.qml
@@ -86,6 +86,7 @@ Item {
     Connections {
         target: _dialogComponentLoader.item
         onHideDialog: {
+            Qt.inputMethod.hide()
             mainWindowDialog.close()
         }
     }