diff --git a/src/imports/FluentUI/Controls/FluButton.qml b/src/imports/FluentUI/Controls/FluButton.qml
index e8c566b..b84bced 100644
--- a/src/imports/FluentUI/Controls/FluButton.qml
+++ b/src/imports/FluentUI/Controls/FluButton.qml
@@ -36,6 +36,7 @@ Button {
     enabled: !disabled
     horizontalPadding:12
     font:FluTextStyle.Body
+    focusPolicy:Qt.TabFocus
     background: Rectangle{
         implicitWidth: 28
         implicitHeight: 28
diff --git a/src/imports/FluentUI/Controls/FluCheckBox.qml b/src/imports/FluentUI/Controls/FluCheckBox.qml
index bdf8731..131d234 100644
--- a/src/imports/FluentUI/Controls/FluCheckBox.qml
+++ b/src/imports/FluentUI/Controls/FluCheckBox.qml
@@ -30,6 +30,7 @@ Button {
             visible: control.activeFocus
         }
     }
+    focusPolicy:Qt.TabFocus
     contentItem: RowLayout{
         spacing: 4
         Rectangle{
diff --git a/src/imports/FluentUI/Controls/FluControl.qml b/src/imports/FluentUI/Controls/FluControl.qml
index f002b21..3b3b499 100644
--- a/src/imports/FluentUI/Controls/FluControl.qml
+++ b/src/imports/FluentUI/Controls/FluControl.qml
@@ -13,6 +13,7 @@ T.Button {
     horizontalPadding: 0
     spacing: 0
     contentItem: Item{}
+    focusPolicy:Qt.TabFocus
     background: Item{
         FluFocusRectangle{
             visible: control.activeFocus
diff --git a/src/imports/FluentUI/Controls/FluDropDownButton.qml b/src/imports/FluentUI/Controls/FluDropDownButton.qml
index a78b346..9a11c6a 100644
--- a/src/imports/FluentUI/Controls/FluDropDownButton.qml
+++ b/src/imports/FluentUI/Controls/FluDropDownButton.qml
@@ -38,6 +38,7 @@ Button {
     id: control
     rightPadding:35
     enabled: !disabled
+    focusPolicy:Qt.TabFocus
     horizontalPadding:12
     background: Rectangle{
         implicitWidth: 28
diff --git a/src/imports/FluentUI/Controls/FluFilledButton.qml b/src/imports/FluentUI/Controls/FluFilledButton.qml
index 677737b..7faa818 100644
--- a/src/imports/FluentUI/Controls/FluFilledButton.qml
+++ b/src/imports/FluentUI/Controls/FluFilledButton.qml
@@ -26,7 +26,7 @@ Button {
     Accessible.onPressAction: control.clicked()
     id: control
     enabled: !disabled
-    Keys.onSpacePressed: control.visualFocus&&clicked()
+    focusPolicy:Qt.TabFocus
     font:FluTextStyle.Body
     horizontalPadding:12
     background: Rectangle{
diff --git a/src/imports/FluentUI/Controls/FluIconButton.qml b/src/imports/FluentUI/Controls/FluIconButton.qml
index d5db0c4..9ce5174 100644
--- a/src/imports/FluentUI/Controls/FluIconButton.qml
+++ b/src/imports/FluentUI/Controls/FluIconButton.qml
@@ -41,6 +41,7 @@ Button {
     Accessible.onPressAction: control.clicked()
     id:control
     width: 30
+    focusPolicy:Qt.TabFocus
     height: 30
     implicitWidth: width
     implicitHeight: height
diff --git a/src/imports/FluentUI/Controls/FluNavigationView.qml b/src/imports/FluentUI/Controls/FluNavigationView.qml
index ded1919..95dea25 100644
--- a/src/imports/FluentUI/Controls/FluNavigationView.qml
+++ b/src/imports/FluentUI/Controls/FluNavigationView.qml
@@ -838,6 +838,7 @@ Item {
                     id:item_button
                     width: 160
                     padding:10
+                    focusPolicy:Qt.TabFocus
                     background: Rectangle{
                         color:  {
                             if(hovered){
diff --git a/src/imports/FluentUI/Controls/FluRadioButton.qml b/src/imports/FluentUI/Controls/FluRadioButton.qml
index c95f0ec..8c91b22 100644
--- a/src/imports/FluentUI/Controls/FluRadioButton.qml
+++ b/src/imports/FluentUI/Controls/FluRadioButton.qml
@@ -28,6 +28,7 @@ Button {
             visible: control.activeFocus
         }
     }
+    focusPolicy:Qt.TabFocus
     font:FluTextStyle.Body
     onClicked: clickListener()
     contentItem: RowLayout{
diff --git a/src/imports/FluentUI/Controls/FluTextButton.qml b/src/imports/FluentUI/Controls/FluTextButton.qml
index f8b9bdd..6005c5d 100644
--- a/src/imports/FluentUI/Controls/FluTextButton.qml
+++ b/src/imports/FluentUI/Controls/FluTextButton.qml
@@ -21,7 +21,7 @@ Button {
         return hovered ? hoverColor :normalColor
     }
     id: control
-    horizontalPadding:12
+    horizontalPadding:2
     enabled: !disabled
     Keys.onSpacePressed: control.visualFocus&&clicked()
     background: Item{
@@ -32,6 +32,7 @@ Button {
             radius:8
         }
     }
+    focusPolicy:Qt.TabFocus
     Accessible.role: Accessible.Button
     Accessible.name: control.text
     Accessible.description: contentDescription
diff --git a/src/imports/FluentUI/Controls/FluToggleButton.qml b/src/imports/FluentUI/Controls/FluToggleButton.qml
index 2c4fa13..41ff396 100644
--- a/src/imports/FluentUI/Controls/FluToggleButton.qml
+++ b/src/imports/FluentUI/Controls/FluToggleButton.qml
@@ -36,6 +36,7 @@ Button {
     Accessible.name: control.text
     Accessible.description: contentDescription
     Accessible.onPressAction: control.clicked()
+    focusPolicy:Qt.TabFocus
     id: control
     enabled: !disabled
     horizontalPadding:12
diff --git a/src/imports/FluentUI/Controls/FluToggleSwitch.qml b/src/imports/FluentUI/Controls/FluToggleSwitch.qml
index e1107b3..62c6814 100644
--- a/src/imports/FluentUI/Controls/FluToggleSwitch.qml
+++ b/src/imports/FluentUI/Controls/FluToggleSwitch.qml
@@ -22,6 +22,7 @@ Button {
     height: 20
     enabled: !disabled
     implicitHeight: height
+    focusPolicy:Qt.TabFocus
     onClicked: clickListener()
     contentItem: Item{}
     background : RowLayout{