@@ -690,7 +690,7 @@ AbstractStage {
690690 readonly property bool dragging: touchControls.overlayShown ? touchControls.dragging : decoratedWindow.dragging
691691
692692 readonly property string appId: model.application.appId
693− readonly property bool isDash: model.application.appId == "unity8-dash"
693+ readonly property bool isDash: appId == "unity8-dash"
694694 readonly property alias clientAreaItem: decoratedWindow.clientAreaItem
695695
696696 function claimFocus() {
@@ -1143,7 +1143,7 @@ AbstractStage {
11431143 }
11441144 },
11451145 State {
1146− name: "fullscreen"; when: surface ? surface.state === Mir.FullscreenState : application.fullscreen && !appDelegate.minimized
1146+ name: "fullscreen"; when: appDelegate.fullscreen
11471147 PropertyChanges {
11481148 target: appDelegate;
11491149 requestedX: 0
@@ -1496,7 +1496,7 @@ AbstractStage {
14961496 objectName: "dragArea"
14971497 anchors.fill: decoratedWindow
14981498 enabled: false
1499− closeable: model.application.appId !== "unity8-dash"
1499+ closeable: !appDelegate.isDash
15001500
15011501 onClicked: {
15021502 spreadItem.highlightedIndex = index;