=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2016-01-28 10:49:33 +0000
+++ qml/Dash/GenericScopeView.qml	2016-02-09 11:57:28 +0000
@@ -785,7 +785,6 @@
 
         readonly property bool processing: item && item.processing || false
         readonly property int count: item && item.count || 0
-        readonly property int currentIndex: item && item.currentIndex || 0
         readonly property var currentItem: item && item.currentItem || null
 
         property string subPage: ""
@@ -800,7 +799,7 @@
         }
 
         source: switch(subPage) {
-            case "preview": return "PreviewListView.qml";
+            case "preview": return "PreviewView.qml";
             case "settings": return "ScopeSettingsPage.qml";
             default: return "";
         }

=== renamed file 'qml/Dash/PreviewListView.qml' => 'qml/Dash/PreviewView.qml'
--- qml/Dash/PreviewListView.qml	2016-02-08 12:24:45 +0000
+++ qml/Dash/PreviewView.qml	2016-02-09 16:01:55 +0000
@@ -23,6 +23,7 @@
 Item {
     id: root
 
+    property bool open: false
     property int initialIndex: -1
     property var initialIndexPreviewStack: null
     property var scope: null
@@ -32,11 +33,9 @@
 
     property alias showSignatureLine: header.showSignatureLine
 
-    property alias open: previewListView.open
-    property alias model: previewListView.model
-    property alias currentIndex: previewListView.currentIndex
-    property alias currentItem: previewListView.currentItem
-    property alias count: previewListView.count
+    property var model
+    property alias currentIndex: previewLoader.index
+    property alias currentItem: previewLoader.item
 
     readonly property bool processing: currentItem && (!currentItem.previewModel.loaded
                                                        || currentItem.previewModel.processingAction)
@@ -55,60 +54,49 @@
         onBackClicked: root.backClicked()
     }
 
-    ListView  {
-        id: previewListView
-        objectName: "listView"
+    onOpenChanged: {
+        if (!open) {
+            // Cancel any pending preview requests or actions
+            if (currentItem && currentItem.previewData !== undefined) {
+                currentItem.previewData.cancelAction();
+            }
+            root.scope.cancelActivation();
+            model = undefined;
+        }
+    }
+
+    onModelChanged: {
+        if (previewLoader.active && initialIndex >= 0 && !usedInitialIndex) {
+            usedInitialIndex = true;
+            previewLoader.index = initialIndex;
+        }
+    }
+
+    Loader {
+        id: previewLoader
+        objectName: "loader"
         anchors {
             top: header.bottom
             bottom: parent.bottom
             left: parent.left
             right: parent.right
         }
-        orientation: ListView.Horizontal
-        highlightRangeMode: ListView.StrictlyEnforceRange
-        snapMode: ListView.SnapOneItem
-        boundsBehavior: Flickable.DragAndOvershootBounds
-        highlightMoveDuration: 250
-        flickDeceleration: units.gu(625)
-        maximumFlickVelocity: width * 5
-        interactive: false
-        cacheBuffer: 0
-
-        property bool open: false
-
-        onOpenChanged: {
-            if (!open) {
-                // Cancel any pending preview requests or actions
-                if (previewListView.currentItem && previewListView.currentItem.previewData !== undefined) {
-                    previewListView.currentItem.previewData.cancelAction();
-                }
-                root.scope.cancelActivation();
-                model = undefined;
-            }
-        }
-
-        onModelChanged: {
-            if (count > 0 && initialIndex >= 0 && !usedInitialIndex) {
-                usedInitialIndex = true;
-                previewListView.positionViewAtIndex(initialIndex, ListView.SnapPosition);
-            }
-        }
-
-        delegate: Previews.Preview {
+        active: count > 0
+
+        property int index: 0
+        readonly property int count: root.model && root.model.count || 0
+
+        sourceComponent: Previews.Preview {
             id: preview
             objectName: "preview" + index
-            height: previewListView.height
-            width: previewListView.width
+            height: previewLoader.height
+            width: previewLoader.width
 
-            isCurrent: ListView.isCurrentItem
+            property int index: 0
 
             readonly property var previewStack: {
-                if (root.open) {
-                    if (index === root.initialIndex) {
-                        return root.initialIndexPreviewStack;
-                    } else {
-                        return root.scope.preview(result, root.categoryId);
-                    }
+                if (root.open && index === root.initialIndex) {
+                    return root.initialIndexPreviewStack;
                 } else {
                     return null;
                 }
@@ -121,8 +109,11 @@
                     return null;
                 }
             }
+        }
 
-            scopeStyle: root.scopeStyle
+        onLoaded: {
+            item.index = Qt.binding(function() { return index; });
+            item.scopeStyle = Qt.binding(function() { return root.scopeStyle; });
         }
     }
 

=== modified file 'qml/Dash/Previews/Preview.qml'
--- qml/Dash/Previews/Preview.qml	2015-11-26 16:36:41 +0000
+++ qml/Dash/Previews/Preview.qml	2016-02-09 13:09:18 +0000
@@ -34,9 +34,6 @@
      */
     property var previewModel
 
-    //! \brief Should be set to true if this preview is currently displayed.
-    property bool isCurrent: false
-
     //! \brief The ScopeStyle component.
     property var scopeStyle: null
 
@@ -68,8 +65,8 @@
                 id: column
                 objectName: "previewListRow" + index
                 anchors {
-                    top: parent.top
-                    bottom: parent.bottom
+                    top: parent ? parent.top : undefined
+                    bottom: parent ? parent.bottom : undefined
                 }
                 width: row.columnWidth
                 spacing: row.spacing
@@ -88,7 +85,6 @@
                     widgetId: model.widgetId
                     widgetType: model.type
                     widgetData: model.properties
-                    isCurrentPreview: root.isCurrent
                     scopeStyle: root.scopeStyle
                     parentFlickable: column
 

=== modified file 'qml/Dash/Previews/PreviewExpandable.qml'
--- qml/Dash/Previews/PreviewExpandable.qml	2015-09-18 07:43:38 +0000
+++ qml/Dash/Previews/PreviewExpandable.qml	2016-02-09 11:30:56 +0000
@@ -84,7 +84,6 @@
                 widgetId: model.widgetId
                 widgetType: model.type
                 widgetData: model.properties
-                isCurrentPreview: root.isCurrentPreview
                 scopeStyle: root.scopeStyle
                 anchors {
                     left: parent.left

=== modified file 'qml/Dash/Previews/PreviewRatingEdit.qml'
--- qml/Dash/Previews/PreviewRatingEdit.qml	2015-06-18 09:30:17 +0000
+++ qml/Dash/Previews/PreviewRatingEdit.qml	2016-02-09 11:29:53 +0000
@@ -68,7 +68,6 @@
 
         widgetId: root.widgetId
         widgetData: root.widgetData
-        isCurrentPreview: root.isCurrentPreview
         scopeStyle: root.scopeStyle
 
         ratingValue: widgetData["rating"]

=== modified file 'qml/Dash/Previews/PreviewWidget.qml'
--- qml/Dash/Previews/PreviewWidget.qml	2015-11-26 16:36:41 +0000
+++ qml/Dash/Previews/PreviewWidget.qml	2016-02-09 11:29:39 +0000
@@ -19,9 +19,6 @@
 /*! Interface for preview widgets. */
 
 Item {
-    //! Specifies the preview widget being currently used or not
-    property bool isCurrentPreview: true
-
     //! The widget identifier
     property string widgetId
 

=== modified file 'qml/Dash/Previews/PreviewWidgetFactory.qml'
--- qml/Dash/Previews/PreviewWidgetFactory.qml	2015-11-26 16:36:41 +0000
+++ qml/Dash/Previews/PreviewWidgetFactory.qml	2016-02-09 11:30:44 +0000
@@ -37,9 +37,6 @@
     //! Should the widget show in expanded mode (For those that support it)
     property bool expanded: widgetType !== "expandable" || widgetData["expanded"] === true
 
-    //! Set to true if the parent preview is displayed.
-    property bool isCurrentPreview: false
-
     //! Set margins width.
     property real widgetMargins: status === Loader.Ready ? item.widgetMargins : units.gu(1)
 
@@ -82,7 +79,6 @@
     onLoaded: {
         item.widgetId = Qt.binding(function() { return root.widgetId } )
         item.widgetData = Qt.binding(function() { return root.widgetData } )
-        item.isCurrentPreview = Qt.binding(function() { return root.isCurrentPreview } )
         item.expanded = Qt.binding(function() { return root.expanded } )
         item.scopeStyle = Qt.binding(function() { return root.scopeStyle } )
         item.parentFlickable = Qt.binding(function() { return root.parentFlickable } )

=== modified file 'tests/qmltests/Dash/tst_PreviewListView.qml'
--- tests/qmltests/Dash/tst_PreviewListView.qml	2015-08-24 07:45:32 +0000
+++ tests/qmltests/Dash/tst_PreviewListView.qml	2016-02-09 11:56:26 +0000
@@ -36,8 +36,8 @@
         id: mockResultsModel
     }
 
-    PreviewListView {
-        id: listView
+    PreviewView {
+        id: view
         anchors.fill: parent
         scope: mockScope
         scopeStyle: ScopeStyle {
@@ -47,10 +47,10 @@
 
     UT.UnityTestCase {
         id: testCase
-        name: "PreviewListView"
+        name: "PreviewView"
         when: windowShown
 
-        property MouseArea mouseArea: findChild(listView, "processingMouseArea")
+        property MouseArea mouseArea: findChild(view, "processingMouseArea")
 
         SignalSpy {
             id: clickedSpy
@@ -59,43 +59,43 @@
         }
 
         function init() {
-            listView.model = mockResultsModel;
-            listView.currentIndex = 1;
-            listView.open = true;
+            view.model = mockResultsModel;
+            view.currentIndex = 1;
+            view.open = true;
             verify(testCase.mouseArea, "Can't find the processingMouseArea object.");
         }
 
         function cleanup() {
-            listView.open = false;
-            listView.model = null;
+            view.open = false;
+            view.model = null;
             clickedSpy.clear();
         }
 
         function test_notProcessing() {
             expectFail("", "processingMouseArea should not receive the click.");
-            mouseClick(listView);
+            mouseClick(view);
             clickedSpy.wait();
         }
 
         function test_processing() {
-            verify(listView.currentItem, "currentItem is not ready yet");
-            listView.currentItem.previewModel.setLoaded(false);
-
-            tryCompare(listView, "processing", true);
-
-            mouseClick(listView);
+            verify(view.currentItem, "currentItem is not ready yet");
+            view.currentItem.previewModel.setLoaded(false);
+
+            tryCompare(view, "processing", true);
+
+            mouseClick(view);
             clickedSpy.wait();
         }
 
         function test_title() {
-            var header = findChild(listView, "innerPageHeader");
+            var header = findChild(view, "innerPageHeader");
             verify(header, "Could not find the preview header");
 
             compare(header.config.title, "Mock Scope");
         }
 
         function test_header_style() {
-            var header = findChild(listView, "pageHeader");
+            var header = findChild(view, "pageHeader");
             verify(header, "Could not find the header");
 
             var innerHeader = findChild(header, "innerPageHeader");