diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index eb746d37..7e8db993 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -51,20 +51,50 @@ DrawerType2 {
             headerText: root.headerText
         }
 
-        FlickableType {
+        ListView {
+            id: listView
+
             anchors.top: header.bottom
             anchors.bottom: parent.bottom
-            contentHeight: content.height + 32
+            anchors.left: parent.left
+            anchors.right: parent.right
 
-            ColumnLayout {
-                id: content
+            property bool isFocusable: true
 
-                anchors.top: parent.top
-                anchors.left: parent.left
-                anchors.right: parent.right
+            Keys.onTabPressed: {
+                FocusController.nextKeyTabItem()
+            }
 
-                anchors.leftMargin: 16
-                anchors.rightMargin: 16
+            Keys.onBacktabPressed: {
+                FocusController.previousKeyTabItem()
+            }
+
+            Keys.onUpPressed: {
+                FocusController.nextKeyUpItem()
+            }
+
+            Keys.onDownPressed: {
+                FocusController.nextKeyDownItem()
+            }
+
+            Keys.onLeftPressed: {
+                FocusController.nextKeyLeftItem()
+            }
+
+            Keys.onRightPressed: {
+                FocusController.nextKeyRightItem()
+            }
+
+            ScrollBar.vertical: ScrollBar {
+                policy: ScrollBar.AsNeeded
+            }
+
+            model: 1
+
+            clip: true
+
+            header: ColumnLayout {
+                width: listView.width
 
                 visible: root.contentVisible
 
@@ -72,6 +102,8 @@ DrawerType2 {
                     id: shareButton
                     Layout.fillWidth: true
                     Layout.topMargin: 16
+                    Layout.leftMargin: 16
+                    Layout.rightMargin: 16
 
                     text: qsTr("Share")
                     leftImageSource: "qrc:/images/controls/share-2.svg"
@@ -99,6 +131,8 @@ DrawerType2 {
                     id: copyConfigTextButton
                     Layout.fillWidth: true
                     Layout.topMargin: 8
+                    Layout.leftMargin: 16
+                    Layout.rightMargin: 16
 
                     defaultColor: AmneziaStyle.color.transparent
                     hoveredColor: AmneziaStyle.color.translucentWhite
@@ -118,6 +152,8 @@ DrawerType2 {
                     id: copyNativeConfigStringButton
                     Layout.fillWidth: true
                     Layout.topMargin: 8
+                    Layout.leftMargin: 16
+                    Layout.rightMargin: 16
 
                     visible: false
 
@@ -139,6 +175,8 @@ DrawerType2 {
 
                     Layout.fillWidth: true
                     Layout.topMargin: 24
+                    Layout.leftMargin: 16
+                    Layout.rightMargin: 16
 
                     defaultColor: AmneziaStyle.color.transparent
                     hoveredColor: AmneziaStyle.color.translucentWhite
@@ -265,6 +303,10 @@ DrawerType2 {
                         }
                     }
                 }
+            }
+
+            delegate: ColumnLayout {
+                width: listView.width
 
                 Rectangle {
                     id: qrCodeContainer
@@ -272,6 +314,8 @@ DrawerType2 {
                     Layout.fillWidth: true
                     Layout.preferredHeight: width
                     Layout.topMargin: 20
+                    Layout.leftMargin: 16
+                    Layout.rightMargin: 16
 
                     visible: ExportController.qrCodesCount > 0
 
@@ -283,6 +327,32 @@ DrawerType2 {
 
                         source: ExportController.qrCodesCount ? ExportController.qrCodes[0] : ""
 
+                        property bool isFocusable: true
+
+                        Keys.onTabPressed: {
+                            FocusController.nextKeyTabItem()
+                        }
+
+                        Keys.onBacktabPressed: {
+                            FocusController.previousKeyTabItem()
+                        }
+
+                        Keys.onUpPressed: {
+                            FocusController.nextKeyUpItem()
+                        }
+
+                        Keys.onDownPressed: {
+                            FocusController.nextKeyDownItem()
+                        }
+
+                        Keys.onLeftPressed: {
+                            FocusController.nextKeyLeftItem()
+                        }
+
+                        Keys.onRightPressed: {
+                            FocusController.nextKeyRightItem()
+                        }
+
                         Timer {
                             property int index: 0
                             interval: 1000
@@ -309,6 +379,8 @@ DrawerType2 {
                     Layout.fillWidth: true
                     Layout.topMargin: 24
                     Layout.bottomMargin: 32
+                    Layout.leftMargin: 16
+                    Layout.rightMargin: 16
 
                     visible: ExportController.qrCodesCount > 0