diff --git a/client/ui/qml/Controls2/DropDownType.qml b/client/ui/qml/Controls2/DropDownType.qml
index 48471873..787890cb 100644
--- a/client/ui/qml/Controls2/DropDownType.qml
+++ b/client/ui/qml/Controls2/DropDownType.qml
@@ -226,7 +226,7 @@ Item {
                     backButtonImage: root.headerBackButtonImage
                     backButtonFunction: function() { menu.closeTriggered() }
                     onActiveFocusChanged: {
-                        if(activeFocus) {
+                        if(backButton.enabled && backButton.activeFocus) {
                             root.listView.positionViewAtBeginning()
                         }
                     }
@@ -235,9 +235,10 @@ Item {
 
             Column {
                 id: col
-                anchors.top: parent.top
+                anchors.top: header.bottom
                 anchors.left: parent.left
                 anchors.right: parent.right
+                anchors.topMargin: 16
 
                 spacing: 16
 
diff --git a/client/ui/qml/Controls2/ListViewWithRadioButtonType.qml b/client/ui/qml/Controls2/ListViewWithRadioButtonType.qml
index dda20313..2ced4335 100644
--- a/client/ui/qml/Controls2/ListViewWithRadioButtonType.qml
+++ b/client/ui/qml/Controls2/ListViewWithRadioButtonType.qml
@@ -79,6 +79,30 @@ ListView {
 
             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()
+            }
+
             indicator: Rectangle {
                 width: parent.width - 1
                 height: parent.height
diff --git a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
index f3ae3227..e61dc9f6 100644
--- a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
+++ b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
@@ -148,7 +148,7 @@ PageType {
 
                 clickedFunction: function() {
                     selector.text = selectedText
-                    selector.close()
+                    selector.closeTriggered()
                     if (SitesModel.routeMode !== root.routeModesModel[currentIndex].type) {
                         SitesModel.routeMode = root.routeModesModel[currentIndex].type
                     }