diff --git a/src/controls/FluButton.qml b/src/controls/FluButton.qml
index b346a392..0abcec06 100644
--- a/src/controls/FluButton.qml
+++ b/src/controls/FluButton.qml
@@ -21,7 +21,7 @@ Button {
         border.width: 1
         radius: 4
         FluFocusRectangle{
-            visible: control.visualFocus
+            visible: control.focus
             radius:8
         }
         color:{
diff --git a/src/controls/FluCheckBox.qml b/src/controls/FluCheckBox.qml
index 0e9d6382..5def2f5a 100644
--- a/src/controls/FluCheckBox.qml
+++ b/src/controls/FluCheckBox.qml
@@ -44,7 +44,7 @@ Button {
 
     background: Item{
         FluFocusRectangle{
-            visible: control.visualFocus
+            visible: control.focus
         }
     }
 
diff --git a/src/controls/FluFilledButton.qml b/src/controls/FluFilledButton.qml
index 49c2a4b9..da504754 100644
--- a/src/controls/FluFilledButton.qml
+++ b/src/controls/FluFilledButton.qml
@@ -19,7 +19,7 @@ Button {
     background: Rectangle{
         radius: 4
         FluFocusRectangle{
-            visible: control.visualFocus
+            visible: control.focus
             radius:8
         }
         color:{
diff --git a/src/controls/FluIconButton.qml b/src/controls/FluIconButton.qml
index f6f35bc1..769c197d 100644
--- a/src/controls/FluIconButton.qml
+++ b/src/controls/FluIconButton.qml
@@ -51,7 +51,7 @@ Button {
         radius: 4
         color:control.color
         FluFocusRectangle{
-            visible: control.visualFocus
+            visible: control.focus
         }
     }
 
diff --git a/src/controls/FluRadioButton.qml b/src/controls/FluRadioButton.qml
index f97b7921..8a0de4a9 100644
--- a/src/controls/FluRadioButton.qml
+++ b/src/controls/FluRadioButton.qml
@@ -14,7 +14,7 @@ Button {
     padding:0
     background: Item{
         FluFocusRectangle{
-            visible: control.visualFocus
+            visible: control.focus
         }
     }
     contentItem: RowLayout{
diff --git a/src/controls/FluToggleSwitch.qml b/src/controls/FluToggleSwitch.qml
index 202ca93d..ee52fd58 100644
--- a/src/controls/FluToggleSwitch.qml
+++ b/src/controls/FluToggleSwitch.qml
@@ -14,7 +14,7 @@ Button {
         height: root.height
         radius: height / 2
         FluFocusRectangle{
-            visible: root.visualFocus
+            visible: root.focus
             radius: 20
         }
         color: {