diff --git a/src/controls/Styles/Base/TableViewStyle.qml b/src/controls/Styles/Base/TableViewStyle.qml
index ca4cc4288ee97c70f1e97b9153ed023b3f3638f6..e5e6db2fdb35442fd39a27a357a35d92eb848225 100644
--- a/src/controls/Styles/Base/TableViewStyle.qml
+++ b/src/controls/Styles/Base/TableViewStyle.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt Quick Controls module of the Qt Toolkit.
@@ -110,7 +110,7 @@ ScrollViewStyle {
     */
     property Component rowDelegate: Rectangle {
         height: Math.round(TextSingleton.implicitHeight * 1.2)
-        property color selectedColor: styleData.hasActiveFocus ? "#07c" : "#999"
+        property color selectedColor: control.activeFocus ? "#07c" : "#999"
         color: styleData.selected ? selectedColor :
                                     !styleData.alternate ? alternateBackgroundColor : backgroundColor
     }
diff --git a/src/controls/Styles/Desktop/TableViewStyle.qml b/src/controls/Styles/Desktop/TableViewStyle.qml
index 605c62d63403714e7ca7fc0f99ddea13a68ec584..11f8ed54cec86b6caa90341d8eca8c8b822fd89e 100644
--- a/src/controls/Styles/Desktop/TableViewStyle.qml
+++ b/src/controls/Styles/Desktop/TableViewStyle.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt Quick Controls module of the Qt Toolkit.
@@ -82,7 +82,7 @@ ScrollViewStyle {
         visible: styleData.selected || styleData.alternate
         source: "image://__tablerow/" + (styleData.alternate ? "alternate_" : "")
                 + (styleData.selected ? "selected_" : "")
-                + (styleData.hasActiveFocus ? "active" : "")
+                + (control.activeFocus ? "active" : "")
         height: Math.max(16, RowItemSingleton.implicitHeight)
         border.left: 4 ; border.right: 4
     }
diff --git a/src/controls/TableView.qml b/src/controls/TableView.qml
index a109725317d89efa20b42a022f43a08835d424a3..df4c941fb29c2325c6c313429c5e4e7a6601800f 100644
--- a/src/controls/TableView.qml
+++ b/src/controls/TableView.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt Quick Controls module of the Qt Toolkit.
@@ -149,6 +149,7 @@ ScrollView {
     \li  styleData.elideMode - the elide mode of the column
     \li  styleData.textAlignment - the horizontal text alignment of the column
     \li  styleData.pressed - true when the item is pressed (since QtQuick.Controls 1.3)
+    \li  styleData.hasActiveFocus - true when the row has focus (since QtQuick.Controls 1.3)
     \endlist
 
     Example:
@@ -179,6 +180,7 @@ ScrollView {
     \li  styleData.alternate - true when the row uses the alternate background color
     \li  styleData.selected - true when the row is currently selected
     \li  styleData.row - the index of the row
+    \li  styleData.hasActiveFocus - true when the row has focus
     \li  styleData.pressed - true when the row is pressed (since QtQuick.Controls 1.3)
     \endlist
 
@@ -761,7 +763,7 @@ ScrollView {
                     property QtObject styleData: QtObject {
                         readonly property bool alternate: (index + rowCount) % 2 === 1
                         readonly property bool selected: false
-                        readonly property bool hasActiveFocus: root.activeFocus
+                        readonly property bool hasActiveFocus: false
                         readonly property bool pressed: false
                     }
                     readonly property var model: listView.model
@@ -924,7 +926,7 @@ ScrollView {
                         readonly property int row: rowitem.rowIndex
                         readonly property bool alternate: rowitem.alternate
                         readonly property bool selected: rowitem.itemSelected
-                        readonly property bool hasActiveFocus: root.activeFocus
+                        readonly property bool hasActiveFocus: rowitem.activeFocus
                         readonly property bool pressed: rowitem.rowIndex === mousearea.pressedRow
                     }
                     readonly property var model: listView.model
@@ -955,6 +957,7 @@ ScrollView {
                                 readonly property int elideMode: columnItem.elideMode
                                 readonly property int textAlignment: columnItem.horizontalAlignment
                                 readonly property bool selected: rowitem.itemSelected
+                                readonly property bool hasActiveFocus: rowitem.activeFocus
                                 readonly property bool pressed: row === mousearea.pressedRow && column === mousearea.pressedColumn
                                 readonly property color textColor: rowitem.itemTextColor
                                 readonly property string role: columnItem.role