diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index ffa6502563..4c143dcf0b 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -591,7 +591,12 @@ UM.MainWindow
         modality: Qt.WindowModal
         selectMultiple: true
         nameFilters: UM.MeshFileHandler.supportedReadFileTypes;
-        folder: CuraApplication.getDefaultPath("dialog_load_path")
+        folder:
+        {
+            //Because several implementations of the file dialog only update the folder when it is explicitly set.
+            folder = CuraApplication.getDefaultPath("dialog_load_path");
+            return CuraApplication.getDefaultPath("dialog_load_path");
+        }
         onAccepted:
         {
             // Because several implementations of the file dialog only update the folder
diff --git a/resources/qml/MainWindow/MainWindowHeader.qml b/resources/qml/MainWindow/MainWindowHeader.qml
index 43ec03d947..5d1a20c8b1 100644
--- a/resources/qml/MainWindow/MainWindowHeader.qml
+++ b/resources/qml/MainWindow/MainWindowHeader.qml
@@ -55,6 +55,7 @@ Item
 
             delegate: Button
             {
+                id: stageSelectorButton
                 text: model.name.toUpperCase()
                 checkable: true
                 checked: UM.Controller.activeStage !== null && model.id == UM.Controller.activeStage.stageId