diff --git a/src/qml/Base/HButtonBackground.qml b/src/qml/Base/HButtonBackground.qml
index 4d9accbb..52efb65b 100644
--- a/src/qml/Base/HButtonBackground.qml
+++ b/src/qml/Base/HButtonBackground.qml
@@ -21,7 +21,7 @@ Rectangle {
 
                button.enabled && button.pressed ? buttonTheme.pressedOverlay :
 
-               (button.enabled && button.hovered) || button.visualFocus ?
+               (button.enabled && button.hovered) || button.activeFocus ?
                buttonTheme.hoveredOverlay :
 
                "transparent"
diff --git a/src/qml/Base/HCheckBox.qml b/src/qml/Base/HCheckBox.qml
index da0fa3d2..011bcded 100644
--- a/src/qml/Base/HCheckBox.qml
+++ b/src/qml/Base/HCheckBox.qml
@@ -27,7 +27,7 @@ CheckBox {
             box.enabled && box.pressed ?
             theme.controls.checkBox.boxPressedBorder :
 
-            (box.enabled && box.hovered) || box.visualFocus ?
+            (box.enabled && box.hovered) || box.activeFocus ?
             theme.controls.checkBox.boxHoveredBorder :
 
             theme.controls.checkBox.boxBorder