diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties
index b59ae5c22..59ead4cac 100644
--- a/core/resources/l10n/messages.properties
+++ b/core/resources/l10n/messages.properties
@@ -389,6 +389,7 @@ simedtdlg.IntensityDesc.Extreme = Extreme
 SimulationEditDialog.btn.plot = Plot
 SimulationEditDialog.btn.export = Export
 SimulationEditDialog.btn.edit = Edit
+SimulationEditDialog.btn.simulate = Simulate
 SimulationEditDialog.btn.simulateAndPlot = Simulate & Plot
 
 GeodeticComputationStrategy.flat.name = Flat Earth
diff --git a/core/src/net/sf/openrocket/gui/simulation/SimulationEditDialog.java b/core/src/net/sf/openrocket/gui/simulation/SimulationEditDialog.java
index a4a461db4..ae0784c30 100644
--- a/core/src/net/sf/openrocket/gui/simulation/SimulationEditDialog.java
+++ b/core/src/net/sf/openrocket/gui/simulation/SimulationEditDialog.java
@@ -206,6 +206,9 @@ public class SimulationEditDialog extends JDialog {
 		
 		//// Run simulation button
 		button = new JButton(trans.get("SimulationEditDialog.btn.simulateAndPlot"));
+		if (!isSingleEdit()) {
+			button.setText(trans.get("SimulationEditDialog.btn.simulate"));
+		}
 		button.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
@@ -214,6 +217,8 @@ public class SimulationEditDialog extends JDialog {
 				refreshView();
 				if (allowsPlotMode()) {
 					setPlotMode();
+				} else {
+					setVisible(false);
 				}
 			}
 		});