diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index d3bbaa17..ed50807a 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -90,6 +90,7 @@ DrawerType2 {
             model: 1
 
             clip: true
+            reuseItems: true
 
             header: ColumnLayout {
                 width: listView.width
diff --git a/client/ui/qml/Controls2/BasicButtonType.qml b/client/ui/qml/Controls2/BasicButtonType.qml
index aa8103e9..ae4fc841 100644
--- a/client/ui/qml/Controls2/BasicButtonType.qml
+++ b/client/ui/qml/Controls2/BasicButtonType.qml
@@ -176,7 +176,7 @@ Button {
             ButtonTextType {
                 id: buttonText
 
-                color: textColor
+                color: root.textColor
                 text: root.text
                 visible: root.text === "" ? false : true
 
diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index 787890cb..60751e21 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -225,11 +225,6 @@ Item {
                     id: backButton
                     backButtonImage: root.headerBackButtonImage
                     backButtonFunction: function() { menu.closeTriggered() }
-                    onActiveFocusChanged: {
-                        if(backButton.enabled && backButton.activeFocus) {
-                            root.listView.positionViewAtBeginning()
-                        }
-                    }
                 }
             }
 
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index f5ac8ae3..b359b98c 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -142,13 +142,6 @@ PageType {
                 drawer.expandedHeight = implicitHeight
             }
 
-            Connections {
-                objectName: "drawerConnections"
-
-                target: drawer
-                enabled: !GC.isMobile()
-            }
-
             ColumnLayout {
                 id: collapsed
                 objectName: "collapsedColumnLayout"
@@ -298,16 +291,6 @@ PageType {
                 }
             }
 
-            Connections {
-                target: drawer
-                enabled: !GC.isMobile()
-                function onIsCollapsedChanged() {
-                    if (!drawer.isCollapsed) {
-                        focusItem1.forceActiveFocus()
-                    }
-                }
-            }
-
             ColumnLayout {
                 id: serversMenuHeader
                 objectName: "serversMenuHeader"
diff --git a/client/ui/qml/Pages2/PageProtocolAwgClientSettings.qml b/client/ui/qml/Pages2/PageProtocolAwgClientSettings.qml
index 859d155e..d31f63e3 100644
--- a/client/ui/qml/Pages2/PageProtocolAwgClientSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolAwgClientSettings.qml
@@ -240,7 +240,6 @@ PageType {
                     id: underloadPacketMagicHeaderTextField
                     Layout.fillWidth: true
                     Layout.topMargin: 16
-                    parentFlickable: fl
 
                     enabled: false
 
diff --git a/client/ui/qml/Pages2/PageSetupWizardEasy.qml b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
index 27df72b0..eb6000c2 100644
--- a/client/ui/qml/Pages2/PageSetupWizardEasy.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardEasy.qml
@@ -87,6 +87,8 @@ PageType {
                 property int containerDefaultPort
                 property int containerDefaultTransportProto
 
+                property bool isFocusable: true
+
                 delegate: Item {
                     implicitWidth: containers.width
                     implicitHeight: delegateContent.implicitHeight
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index c238d6c4..a95fd78e 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -182,15 +182,6 @@ PageType {
                     shareFullAccessDrawer.openTriggered()
                 }
 
-                actionButton.onFocusChanged: {
-                    console.debug("MOVE THIS LOGIC TO CPP!")
-                    if (actionButton.activeFocus) {
-                        if (fl) {
-                            fl.ensureVisible(moreButton)
-                        }
-                    }
-                }
-
                 DrawerType2 {
                     id: shareFullAccessDrawer
 
@@ -677,38 +668,7 @@ PageType {
                 }
 
                 clip: true
-                // interactive: false
-
-                // activeFocusOnTab: true
-                // focus: true
-                // Keys.onTabPressed: {
-                //     if (!GC.isMobile()) {
-                //         if (currentIndex < this.count - 1) {
-                //             this.incrementCurrentIndex()
-                //             // currentItem.focusItem.forceActiveFocus()
-                //         } else {
-                //             this.currentIndex = 0
-                //             // lastItemTabClicked(focusItem)
-                //         }
-                //     }
-                // }
-
-                // onActiveFocusChanged: {
-                //     if (focus && !GC.isMobile()) {
-                //         currentIndex = 0
-                //         // currentItem.focusItem.forceActiveFocus()
-                //     }
-                // }
-
-                // onCurrentIndexChanged: {
-                //     if (currentItem) {
-                //         if (currentItem.y < a.contentY) {
-                //             a.contentY = currentItem.y
-                //         } else if (currentItem.y + currentItem.height + clientsListView.y > a.contentY + a.height) {
-                //             a.contentY = currentItem.y + clientsListView.y + currentItem.height - a.height
-                //         }
-                //     }
-                // }
+                reuseItems: true
 
                 delegate: Item {
                     implicitWidth: clientsListView.width