diff --git a/src/components/ExportButton.tsx b/src/components/ExportButton.tsx
index 3086599..bb7b091 100644
--- a/src/components/ExportButton.tsx
+++ b/src/components/ExportButton.tsx
@@ -52,7 +52,7 @@ export default function ExportButton({className, style}: {className?: string, st
         {
           data: '3mf',
           buttonLabel: 'Download 3MF',
-          label: '3MF (3D Manufacturing Format)',
+          label: '3MF (Multimaterial)',
           icon: 'pi pi-file',
           command: () => model!.setFormats(undefined, '3mf'),
         },
diff --git a/src/components/MultimaterialColorsDialog.tsx b/src/components/MultimaterialColorsDialog.tsx
index bd65e20..1d4c38b 100644
--- a/src/components/MultimaterialColorsDialog.tsx
+++ b/src/components/MultimaterialColorsDialog.tsx
@@ -43,11 +43,12 @@ export default function MultimaterialColorsDialog() {
                     disabled={!tempExtruderColors.every(c => chroma.valid(c) || c.trim() === '')}
                     autoFocus
                     onClick={e => {
+                        const wasExporting = state.view.extruderPickerVisibility === 'exporting';
                         model!.mutate(s => {
                             s.params.extruderColors = tempExtruderColors.filter(c => c.trim() !== '');
                             s.view.extruderPickerVisibility = undefined;
                         });
-                        if (state.view.extruderPickerVisibility === 'exporting') {
+                        if (wasExporting) {
                             model!.export();
                         }
                     }} />