diff --git a/framework/qml/View.qml b/framework/qml/View.qml
index 67d7020a..d188f550 100644
--- a/framework/qml/View.qml
+++ b/framework/qml/View.qml
@@ -1,166 +1,166 @@
 /*
  *  Copyright (C) 2017 Michael Bohlender, <michael.bohlender@kdemail.net>
  *  Copyright (C) 2017 Christian Mollekopf, <mollekopf@kolabsys.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 
 import QtQuick 2.7
 import QtQuick.Controls 2
 import QtQuick.Layouts 1.1
 import org.kube.framework 1.0 as Kube
 
 FocusScope {
     id: root
 
     //Use overlayArea to position an overlay window, parented to ApplicationWindow.window, over just the view-section without the sidebar.
-    property int sidebarWidth: ApplicationWindow.window.sidebarWidth ? ApplicationWindow.window.sidebarWidth : 0
-    property int windowWidth: ApplicationWindow.window.width ? ApplicationWindow.window.width : width
-    property int windowHeight: ApplicationWindow.window.height ? ApplicationWindow.window.height : height
+    property int sidebarWidth: ApplicationWindow.window && ApplicationWindow.window.sidebarWidth ? ApplicationWindow.window.sidebarWidth : 0
+    property int windowWidth: ApplicationWindow.window && ApplicationWindow.window.width ? ApplicationWindow.window.width : width
+    property int windowHeight: ApplicationWindow.window && ApplicationWindow.window.height ? ApplicationWindow.window.height : height
     property rect overlayArea: Qt.rect(sidebarWidth, 0, windowWidth - sidebarWidth, windowHeight)
 
     //Search
     property rect searchArea
     property string filter: ""
     property var searchObject: null
     function triggerSearch() {
         if (!searchObject && StackView.visible) {
             searchObject = searchComponent.createObject(root)
         }
     }
     function clearSearch() {
         if (searchObject) {
             searchObject.close()
             searchObject = null
         }
     }
 
     //Help
     property Component helpViewComponent: null
     function showHelp() {
         if (helpViewComponent) {
             helpViewComponent.createObject(root).open()
         }
     }
 
     //View columns
     property int visibleViews: 0 //0 means the feature is disabled entirely
     property int currentIndex: 0
     property int count: contentItems.length
     default property alias contentItems: content.data
 
     property bool __aborted: false
 
     //This signal will be emitted to refresh the views contents. Fetch data in here.
     signal refresh()
 
     //This signal will be emitted once all initial properties have been set and the view is ready to load
     signal setup()
 
     StackView.onActivated: {
         root.refresh()
     }
 
     StackView.onDeactivated: {
         clearSearch()
     }
 
     //This signal will be emitted before destruction if the view was not done
     signal aborted()
     onAborted: {
         __aborted = true
     }
 
     //This signal will be emitted when the view is done
     signal done()
     onDone: {
         if (!__aborted) {
             Kube.Fabric.postMessage(Kube.Messages.componentDone, {})
         }
     }
 
     onCurrentIndexChanged: showRelevantSplits()
     Component.onCompleted: {
         root.setup()
         showRelevantSplits()
     }
 
     function incrementCurrentIndex() {
         if (currentIndex < count) {
             currentIndex = currentIndex + 1
         }
     }
 
     function decrementCurrentIndex() {
         if (currentIndex > 0) {
             currentIndex = currentIndex - 1
         }
     }
 
     function showRelevantSplits() {
         if (!visibleViews) {
             return
         }
         var i;
         for (i = 0; i < count; i++) {
             if ('visible' in contentItems[i]) {
                 if (i < currentIndex) {
                     contentItems[i].visible = false;
                 } else if (i > (currentIndex + visibleViews - 1)) {
                     contentItems[i].visible = false;
                 } else {
                     contentItems[i].visible = true;
                 }
             }
         }
 
     }
 
     Kube.IconButton {
         anchors {
             top: root.top
             left: root.left
         }
         z: 1
         color: Kube.Colors.darkBackgroundColor
         iconName: Kube.Icons.goBack_inverted
         visible: currentIndex > 0
         onClicked: decrementCurrentIndex()
     }
 
     Keys.onEscapePressed: {
         if (currentIndex > 0) {
             decrementCurrentIndex()
         }
     }
 
     RowLayout {
         id: content
         anchors.fill: parent
     }
 
     Component {
         id: searchComponent
         Kube.SearchPopup {
             searchArea: root.searchArea
             onFilterChanged: {
                 root.filter = filter
             }
         }
 
     }
 
 }