diff --git a/client/ui/qml/Controls2/HeaderType.qml b/client/ui/qml/Controls2/HeaderType.qml
index f1cafbff7..1366148d8 100644
--- a/client/ui/qml/Controls2/HeaderType.qml
+++ b/client/ui/qml/Controls2/HeaderType.qml
@@ -19,8 +19,6 @@ Item {
 
     property string descriptionText
 
-    focus: true
-
     implicitWidth: content.implicitWidth
     implicitHeight: content.implicitHeight
 
diff --git a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
index dae96b5a3..aa04eb29b 100644
--- a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
@@ -158,7 +158,6 @@ PageType {
                             enabled: isPortEditable | isCipherEditable
 
                             text: qsTr("Save")
-                            Keys.onTabPressed: lastItemTabClicked(focusItem)
 
                             clickedFunc: function() {
                                 forceActiveFocus()
diff --git a/client/ui/qml/Pages2/PageProtocolXraySettings.qml b/client/ui/qml/Pages2/PageProtocolXraySettings.qml
index d74aabad9..6d53fdd34 100644
--- a/client/ui/qml/Pages2/PageProtocolXraySettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolXraySettings.qml
@@ -118,8 +118,6 @@ PageType {
 
                             text: qsTr("Save")
 
-                            Keys.onTabPressed: lastItemTabClicked(focusItem)
-
                             onClicked: {
                                 forceActiveFocus()
 
diff --git a/client/ui/qml/Pages2/PageSettingsAppSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsAppSplitTunneling.qml
index 4751aa71d..2e86a0dc2 100644
--- a/client/ui/qml/Pages2/PageSettingsAppSplitTunneling.qml
+++ b/client/ui/qml/Pages2/PageSettingsAppSplitTunneling.qml
@@ -253,7 +253,6 @@ PageType {
             textFieldPlaceholderText: qsTr("application name")
             buttonImageSource: "qrc:/images/controls/plus.svg"
 
-            Keys.onTabPressed: lastItemTabClicked(focusItem)
             rightButtonClickedOnEnter: true
 
             clickedFunc: function() {
diff --git a/client/ui/qml/Pages2/PageSettingsApplication.qml b/client/ui/qml/Pages2/PageSettingsApplication.qml
index 4dea8c65f..c5fc0bc15 100644
--- a/client/ui/qml/Pages2/PageSettingsApplication.qml
+++ b/client/ui/qml/Pages2/PageSettingsApplication.qml
@@ -205,7 +205,6 @@ PageType {
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
                 textColor: AmneziaStyle.color.vibrantRed
 
-                Keys.onTabPressed: lastItemTabClicked()
                 parentFlickable: fl
 
                 clickedFunction: function() {
@@ -246,11 +245,5 @@ PageType {
 
         width: root.width
         height: root.height
-
-        // onClosed: {
-        //     if (!GC.isMobile()) {
-        //         focusItem.forceActiveFocus()
-        //     }
-        // }
     }
 }
diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
index de8275f12..3cf52c3f9 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
@@ -104,23 +104,10 @@ PageType {
                         DrawerType2 {
                             id: showDetailsDrawer
                             parent: root
-                            onClosed: {
-                                if (!GC.isMobile()) {
-                                    // defaultActiveFocusItem.forceActiveFocus()
-                                }
-                            }
 
                             anchors.fill: parent
                             expandedHeight: parent.height * 0.9
                             expandedStateContent: Item {
-                                Connections {
-                                    target: showDetailsDrawer
-                                    enabled: !GC.isMobile()
-                                    function onOpened() {
-                                        focusItem2.forceActiveFocus()
-                                    }
-                                }
-
                                 implicitHeight: showDetailsDrawer.expandedHeight
 
                                 // Item {
@@ -196,7 +183,7 @@ PageType {
                                             parentFlickable: fl
 
                                             text: qsTr("Close")
-                                            Keys.onTabPressed: lastItemTabClicked(focusItem2)
+                                            // Keys.onTabPressed: lastItemTabClicked(focusItem2)
 
 											clickedFunc: function()  {
                                                 showDetailsDrawer.close()
@@ -248,7 +235,7 @@ PageType {
 
                             text: qsTr("Install")
 
-                            Keys.onTabPressed: lastItemTabClicked(focusItem)
+                            // Keys.onTabPressed: lastItemTabClicked(focusItem)
 
                             clickedFunc: function() {
                                 if (!port.textField.acceptableInput &&
diff --git a/client/ui/qml/Pages2/PageSetupWizardTextKey.qml b/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
index 868807132..126a7c919 100644
--- a/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardTextKey.qml
@@ -73,7 +73,6 @@ PageType {
         anchors.bottomMargin: 32
 
         text: qsTr("Continue")
-        Keys.onTabPressed: lastItemTabClicked(focusItem)
 
         clickedFunc: function() {
             if (ImportController.extractConfigFromData(textKey.textFieldText)) {
diff --git a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
index 52c12c56b..140967421 100644
--- a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml
@@ -178,8 +178,6 @@ PageType {
         anchors.rightMargin: 16
         anchors.leftMargin: 16
 
-        Keys.onTabPressed: lastItemTabClicked(focusItem)
-
         BasicButtonType {
             id: connectButton
             Layout.fillWidth: true