1 files changed, 7 insertions, 2 deletions

diff --git a/framework/qml/ModelIndexRetriever.qml b/framework/qml/ModelIndexRetriever.qml
index fa3fb64b..d01ceb71 100644
--- a/framework/qml/ModelIndexRetriever.qml
+++ b/framework/qml/ModelIndexRetriever.qml
@@ -21,11 +21,16 @@ import QtQuick 2.4
 Repeater {
     id: root
     property var currentData
+    property int currentIndex: 0
+    onCurrentIndexChanged: {
+        currentData = itemAt(currentIndex).currentData
+    }
     Item {
-        id: delegate
         property var currentData: model
         onCurrentDataChanged: {
-            root.currentData = model
+            if (index == root.currentIndex) {
+                root.currentData = model
+            }
         }
         visible: false
     }