diff --git a/meshroom/ui/qml/Viewer/Viewer2D.qml b/meshroom/ui/qml/Viewer/Viewer2D.qml
index 302cf452e5..c2db199bf6 100644
--- a/meshroom/ui/qml/Viewer/Viewer2D.qml
+++ b/meshroom/ui/qml/Viewer/Viewer2D.qml
@@ -281,6 +281,8 @@ FocusScope {
         onSelectedViewIdChanged: {
             root.source = getImageFile();
             root.metadata = getMetadata();
+            if (useExternal)
+                useExternal = false;
         }
     }
 
@@ -663,6 +665,7 @@ FocusScope {
                             text: MaterialIcons.close
                             ToolTip.text: "Clear node"
                             enabled: root.displayedNode
+                            visible: root.displayedNode
                             onClicked: {
                                 root.displayedNode = null
                             }
@@ -1154,12 +1157,12 @@ FocusScope {
                             property string name: names[currentIndex]
 
                             model: names.map(n => (n == "gallery") ? "Image Gallery" : displayedNode.attributes.get(n).label)
-                            enabled: count > 0
+                            enabled: count > 1
 
                             FontMetrics {
                                 id: fontMetrics
                             }
-                            Layout.preferredWidth: model.reduce((acc, label) => Math.max(acc, fontMetrics.boundingRect(label).width), 0) + 3.0*Qt.application.font.pixelSize
+                            Layout.preferredWidth: model.reduce((acc, label) => Math.max(acc, fontMetrics.boundingRect(label).width), 0) + 3.0 * Qt.application.font.pixelSize
                         }
 
                         MaterialToolButton {