diff --git a/src/FactSystem/FactControls/FactTextField.qml b/src/FactSystem/FactControls/FactTextField.qml
index ac3b601b924d8d18f92a8ad788cff1bae382a61a..f4afbe8d357f289df5292867de85f50869eef9a4 100644
--- a/src/FactSystem/FactControls/FactTextField.qml
+++ b/src/FactSystem/FactControls/FactTextField.qml
@@ -14,8 +14,11 @@ QGCTextField {
     property Fact   fact:           null
     property string _validateString
 
-    text:       fact.valueString
-    unitsLabel: fact.units
+    text:               fact.valueString
+    unitsLabel:         fact.units
+
+    // At this point all Facts are numeric
+    inputMethodHints:   Qt.ImhFormattedNumbersOnly
 
     onEditingFinished: {
         if (qgcView) {
diff --git a/src/QmlControls/ParameterEditorDialog.qml b/src/QmlControls/ParameterEditorDialog.qml
index 8834f0a39fd486ab82839d768250298c949648d7..25d688b0e376928581ce4a78019ad4b1d9a64339 100644
--- a/src/QmlControls/ParameterEditorDialog.qml
+++ b/src/QmlControls/ParameterEditorDialog.qml
@@ -84,6 +84,9 @@ QGCViewDialog {
             id:     valueField
             text:   validate ? validateValue : fact.valueString
 
+            // At this point all Facts are numeric
+            inputMethodHints:   Qt.ImhFormattedNumbersOnly
+
             onAccepted: accept()
 
             Keys.onReleased: {