@@ -106,7 +106,7 @@ FocusScope {
106106
107107 onIsCurrentChanged: {
108108 if (pageHeaderLoader.item && showPageHeader) {
109− pageHeaderLoader.item.resetSearch();
109+ pageHeaderLoader.item.resetSearch();
110110 }
111111 subPageLoader.closeSubPage();
112112 }
@@ -439,7 +439,6 @@ FocusScope {
439439 }
440440
441441 onBackClicked: scopeView.backClicked()
442−
443442 onSettingsClicked: subPageLoader.openSubPage("settings")
444443 }
445444 }
@@ -474,14 +473,13 @@ FocusScope {
474473
475474 function openSubPage(page) {
476475 subPage = page;
477− open = true;
478476 }
479477
480478 function closeSubPage() {
481479 open = false;
482480 }
483481
484− source: visible && subPage && (subPage == "preview" ? "PreviewListView.qml" : "ScopeSettingsPage.qml") || ""
482+ source: subPage && (subPage == "preview" ? "PreviewListView.qml" : "ScopeSettingsPage.qml") || ""
485483
486484 onLoaded: {
487485 if (status === Loader.Ready) {
@@ -492,16 +490,13 @@ FocusScope {
492490 item.initialIndex = Qt.binding(function() { return subPageLoader.initialIndex } )
493491 item.model = Qt.binding(function() { return subPageLoader.model } )
494492 }
493+ open = true;
495494 }
496495 }
497496
498497 onOpenChanged: pageHeaderLoader.item.unfocus();
499498
500− onVisibleChanged: {
501− if (!visible) {
502− subPage = "";
503− }
504− }
499+ onVisibleChanged: if (!visible) subPage = "";
505500
506501 Connections {
507502 target: subPageLoader.item