diff --git a/src/QmlControls/ParameterEditorDialog.qml b/src/QmlControls/ParameterEditorDialog.qml
index 1efe2197923cd610c9a8d3c711df08f8d4f46270..c6622eeae23754ac046f1328a31da5478aa4efaf 100644
--- a/src/QmlControls/ParameterEditorDialog.qml
+++ b/src/QmlControls/ParameterEditorDialog.qml
@@ -58,7 +58,7 @@ QGCViewDialog {
             validationError.text = fact.validate(validateValue, false /* convertOnly */)
             forceSave.visible = true
         }
-        valueField.forceActiveFocus()
+        //valueField.forceActiveFocus()
     }
 
     Column {
@@ -82,7 +82,7 @@ QGCViewDialog {
         QGCTextField {
             id:     valueField
             text:   validate ? validateValue : fact.valueString
-            focus:  true
+            //focus:  true
 
             // At this point all Facts are numeric
             inputMethodHints:   Qt.ImhFormattedNumbersOnly
diff --git a/src/QmlControls/QGCView.qml b/src/QmlControls/QGCView.qml
index 929ec302c7a30ce28a7cc00e2dca78283089dbb4..199456e991b6d3975956dfc36d86abe7e12058d6 100644
--- a/src/QmlControls/QGCView.qml
+++ b/src/QmlControls/QGCView.qml
@@ -146,7 +146,7 @@ FactPanel {
         viewPanel.enabled = false
         __dialogOverlay.visible = true
 
-        __dialogComponentLoader.item.forceActiveFocus()
+        //__dialogComponentLoader.item.forceActiveFocus()
 
         __animateShowDialog.start()
     }
@@ -174,7 +174,7 @@ FactPanel {
     }
 
     function hideDialog() {
-        __dialogComponentLoader.item.focus = false
+        //__dialogComponentLoader.item.focus = false
         viewPanel.enabled = true
         __animateHideDialog.start()
     }