diff --git a/client/ui/qml/Pages2/PageSetupWizardApiServicesList.qml b/client/ui/qml/Pages2/PageSetupWizardApiServicesList.qml
index 5e00eebd..c3e3edbc 100644
--- a/client/ui/qml/Pages2/PageSetupWizardApiServicesList.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardApiServicesList.qml
@@ -51,16 +51,20 @@ PageType {
         spacing: 0
 
         property bool isFocusable: true
-        selectedIndex: 1
+        
         clip: true
+        reuseItems: true
+
         model: ApiServicesModel
 
-        ScrollBar.vertical: ScrollBar {}
+        ScrollBar.vertical: ScrollBarType {}
 
         delegate: Item {
             implicitWidth: servicesListView.width
             implicitHeight: delegateContent.implicitHeight
 
+            enabled: isServiceAvailable
+
             ColumnLayout {
                 id: delegateContent
 
@@ -80,8 +84,6 @@ PageType {
 
                     rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
-                    enabled: isServiceAvailable
-
                     onClicked: {
                         if (isServiceAvailable) {
                             ApiServicesModel.setServiceIndex(index)