diff --git a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationConfigDialog.java b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationConfigDialog.java
index b3140e4e7..d7c813d6a 100644
--- a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationConfigDialog.java
+++ b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationConfigDialog.java
@@ -372,12 +372,13 @@ public class SimulationConfigDialog extends JDialog {
 					if (plot != null) {
 						plot.setVisible(true);
 					}
-					closeDialog();
 					return;
 				} else if (tabIdx == EXPORT_IDX) {
-					if (exportTab == null || exportTab.doExport()) {
+					if (exportTab == null) {
 						closeDialog();
+						return;
 					}
+					exportTab.doExport();
 					return;
 				}