diff --git a/resources/qml/Settings/SettingCheckBox.qml b/resources/qml/Settings/SettingCheckBox.qml
index 97a72a026e..2a41f80d2c 100644
--- a/resources/qml/Settings/SettingCheckBox.qml
+++ b/resources/qml/Settings/SettingCheckBox.qml
@@ -17,6 +17,7 @@ SettingItem
         id: control
         anchors.fill: parent
         hoverEnabled: true
+        activeFocusOnTab: true
 
         property bool checked:
         {
@@ -49,6 +50,12 @@ SettingItem
             }
         }
 
+        Keys.onSpacePressed:
+        {
+            forceActiveFocus();
+            propertyProvider.setPropertyValue("value", !checked);
+        }
+
         onClicked:
         {
             forceActiveFocus();
diff --git a/resources/qml/Settings/SettingTextField.qml b/resources/qml/Settings/SettingTextField.qml
index 059980bba2..9ab23ad7c8 100644
--- a/resources/qml/Settings/SettingTextField.qml
+++ b/resources/qml/Settings/SettingTextField.qml
@@ -82,6 +82,7 @@ SettingItem
                 right: parent.right
                 verticalCenter: parent.verticalCenter
             }
+            activeFocusOnTab: true
 
             Keys.onReleased:
             {