@@ -170,6 +170,8 @@ FocusScope {
170170 property int itemScaleOriginX: 0
171171 property int itemScaleOriginY: 0
172172
173+ readonly property string windowTitle: clippedSpreadDelegate.window.title
174+
173175 Behavior on x {
174176 id: closeBehavior
175177 enabled: spreadRepeater.closingIndex >= 0
@@ -326,9 +328,7 @@ FocusScope {
326328 Label {
327329 Layout.fillWidth: true
328330 Layout.preferredHeight: units.gu(6)
329− property string surfaceName: model.surface ? model.surface.name : ""
330− property string applicationName: model.application ? model.application.name : ""
331− text: surfaceName ? surfaceName : applicationName
331+ text: model.application ? model.application.name : spreadDelegate.windowTitle
332332 wrapMode: Text.WordWrap
333333 elide: Text.ElideRight
334334 maximumLineCount: 2
@@ -527,7 +527,7 @@ FocusScope {
527527 Label {
528528 id: currentSelectedLabel
529529 anchors { bottom: parent.bottom; bottomMargin: root.height * 0.625; horizontalCenter: parent.horizontalCenter }
530− text: spreadRepeater.highlightedIndex >= 0 ? topLevelSurfaceList.surfaceAt(spreadRepeater.highlightedIndex).name : ""
530+ text: spreadRepeater.highlightedIndex >= 0 ? spreadRepeater.itemAt(spreadRepeater.highlightedIndex).windowTitle: ""
531531 visible: false
532532 fontSize: "large"
533533 }