diff --git a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
index 7afab6308..da1edee6b 100644
--- a/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardProtocols.qml
@@ -42,19 +42,21 @@ PageType {
         anchors.right: parent.right
 
         anchors.topMargin: 20
+
+        onActiveFocusChanged: {
+            if(backButton.enabled && backButton.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
+        }
     }
 
-    ListView {
+    ListViewType {
         id: listView
         anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
         anchors.right: parent.right
         anchors.left: parent.left
 
-        property bool isFocusable: true
-
-        ScrollBar.vertical: ScrollBarType {}
-
         header: ColumnLayout {
             width: listView.width
 
@@ -72,9 +74,8 @@ PageType {
         }
 
         model: proxyContainersModel
-        clip: true
+
         spacing: 0
-        reuseItems: true
         snapMode: ListView.SnapToItem
 
         delegate: ColumnLayout {
@@ -87,9 +88,9 @@ PageType {
                 descriptionText: description
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
-                clickedFunction: function() {
-                    ContainersModel.setProcessedContainerIndex(proxyContainersModel.mapToSource(index))
-                    PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
+                clickedFunction: function () {
+                    ContainersModel.setProcessedContainerIndex(proxyContainersModel.mapToSource(index));
+                    PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings);
                 }
             }