diff --git a/meshroom/ui/qml/ImageGallery/ImageGallery.qml b/meshroom/ui/qml/ImageGallery/ImageGallery.qml
index 7f3b1afd..1658db1f 100644
--- a/meshroom/ui/qml/ImageGallery/ImageGallery.qml
+++ b/meshroom/ui/qml/ImageGallery/ImageGallery.qml
@@ -345,6 +345,7 @@ Panel {
     footerContent: RowLayout {
         // Images count
         MaterialToolLabel {
+            Layout.minimumWidth: childrenRect.width
             ToolTip.text: grid.model.count + " Input Images"
             iconText: MaterialIcons.image
             label: grid.model.count.toString()
@@ -353,6 +354,7 @@ Panel {
         }
         // cameras count
         MaterialToolLabel {
+            Layout.minimumWidth: childrenRect.width
             ToolTip.text: label + " Estimated Cameras"
             iconText: MaterialIcons.videocam
             label: _reconstruction ? _reconstruction.nbCameras.toString() : "0"
@@ -364,6 +366,7 @@ Panel {
 
         MaterialToolLabelButton {
             id: displayHDR
+            Layout.minimumWidth: childrenRect.width
             property var activeNode: _reconstruction.activeNodes.get("LdrToHdrMerge").node
             ToolTip.text: "Visualize HDR images: " + (activeNode ? activeNode.label : "No Node")
             iconText: MaterialIcons.filter
@@ -405,6 +408,8 @@ Panel {
 
         MaterialToolButton {
             id: imageProcessing
+            Layout.minimumWidth: childrenRect.width
+
             property var activeNode: _reconstruction.activeNodes.get("ImageProcessing").node
             font.pointSize: 15
             padding: 0
@@ -449,6 +454,8 @@ Panel {
 
         // Thumbnail size icon and slider
         MaterialToolButton {
+            Layout.minimumWidth: childrenRect.width
+
             text: MaterialIcons.photo_size_select_large
             ToolTip.text: "Thumbnails Scale"
             padding: 0
diff --git a/meshroom/ui/qml/main.qml b/meshroom/ui/qml/main.qml
index c71148f5..2cf65039 100755
--- a/meshroom/ui/qml/main.qml
+++ b/meshroom/ui/qml/main.qml
@@ -411,7 +411,12 @@ ApplicationWindow {
                 id: saveAsAction
                 text: "Save As..."
                 shortcut: "Ctrl+Shift+S"
-                onTriggered: saveFileDialog.open()
+                onTriggered: {
+                    if(_reconstruction.graph && _reconstruction.graph.filepath) {
+                        saveFileDialog.folder = Filepath.stringToUrl(Filepath.dirname(_reconstruction.graph.filepath))
+                    }
+                    saveFileDialog.open()
+                }
             }
             MenuSeparator { }
             Action {