diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index c209c1ce..35b661d5 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -38,6 +38,14 @@ DrawerType2 {
     expandedContent: Item {
         implicitHeight: root.expandedHeight
 
+        Connections {
+            target: root
+
+            function onOpened() {
+                header.forceActiveFocus()
+            }
+        }
+
         Header2Type {
             id: header
             anchors.top: parent.top
@@ -48,6 +56,8 @@ DrawerType2 {
             anchors.rightMargin: 16
 
             headerText: root.headerText
+
+            KeyNavigation.tab: shareButton
         }
 
         FlickableType {
@@ -68,12 +78,15 @@ DrawerType2 {
                 visible: root.contentVisible
 
                 BasicButtonType {
+                    id: shareButton
                     Layout.fillWidth: true
                     Layout.topMargin: 16
 
                     text: qsTr("Share")
                     imageSource: "qrc:/images/controls/share-2.svg"
 
+                    KeyNavigation.tab: copyConfigTextButton
+
                     clickedFunc: function() {
                         var fileName = ""
                         if (GC.isMobile()) {
@@ -108,12 +121,7 @@ DrawerType2 {
                     text: qsTr("Copy")
                     imageSource: "qrc:/images/controls/copy.svg"
 
-                    clickedFunc: function() {
-                        configText.selectAll()
-                        configText.copy()
-                        configText.select(0, 0)
-                        PageController.showNotificationMessage(qsTr("Copied"))
-                    }
+                    KeyNavigation.tab: copyNativeConfigStringButton.visible ? copyNativeConfigStringButton : showSettingsButton
                 }
 
                 BasicButtonType {
@@ -133,15 +141,12 @@ DrawerType2 {
                     text: qsTr("Copy config string")
                     imageSource: "qrc:/images/controls/copy.svg"
 
-                    clickedFunc: function() {
-                        nativeConfigString.selectAll()
-                        nativeConfigString.copy()
-                        nativeConfigString.select(0, 0)
-                        PageController.showNotificationMessage(qsTr("Copied"))
-                    }
+                    KeyNavigation.tab: showSettingsButton
                 }
 
                 BasicButtonType {
+                    id: showSettingsButton
+
                     Layout.fillWidth: true
                     Layout.topMargin: 24
 
@@ -157,6 +162,8 @@ DrawerType2 {
                     clickedFunc: function() {
                         configContentDrawer.open()
                     }
+
+                    KeyNavigation.tab: header
                 }
 
                 DrawerType2 {
diff --git a/client/ui/qml/Controls2/BasicButtonType.qml b/client/ui/qml/Controls2/BasicButtonType.qml
index 77d4b5fb..d539a6c3 100644
--- a/client/ui/qml/Controls2/BasicButtonType.qml
+++ b/client/ui/qml/Controls2/BasicButtonType.qml
@@ -31,22 +31,23 @@ Button {
     hoverEnabled: true
 
     background: Rectangle {
-        id: background_border
+        id: focusBorder
 
         color: "transparent"
         border.color: root.activeFocus ? root.borderFocusedColor : "transparent"
         border.width: root.activeFocus ? root.borderFocusedWidth : "transparent"
 
         anchors.fill: parent
+
         radius: 16
 
         Rectangle {
             id: background
 
-            anchors.fill: background_border
-            anchors.margins: root.activeFocus ? 2: 0
+            anchors.fill: focusBorder
+            anchors.margins: root.activeFocus ? 2 : 0
 
-            radius: 16
+            radius: root.activeFocus ? 14 : 16
             color: {
                 if (root.enabled) {
                     if (root.pressed) {
@@ -57,8 +58,8 @@ Button {
                     return disabledColor
                 }
             }
-            border.color: root.activeFocus ? "transparent" : borderColor
-            border.width: root.activeFocus ? 0 : borderWidth
+            border.color: borderColor
+            border.width: borderWidth
 
             Behavior on color {
                 PropertyAnimation { duration: 200 }
@@ -93,13 +94,13 @@ Button {
     }
 
     MouseArea {
-        anchors.fill: background_border
+        anchors.fill: focusBorder
         enabled: false
         cursorShape: Qt.PointingHandCursor
     }
 
     contentItem: Item {
-        anchors.fill: background_border
+        anchors.fill: focusBorder
 
         implicitWidth: content.implicitWidth
         implicitHeight: content.implicitHeight