diff --git a/swing/src/net/sf/openrocket/gui/simulation/FlightDataComboBox.java b/swing/src/net/sf/openrocket/gui/simulation/FlightDataComboBox.java
index d61ce038b..b26f677a2 100644
--- a/swing/src/net/sf/openrocket/gui/simulation/FlightDataComboBox.java
+++ b/swing/src/net/sf/openrocket/gui/simulation/FlightDataComboBox.java
@@ -10,7 +10,6 @@ import javax.swing.JComboBox;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
-import java.util.Hashtable;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/swing/src/net/sf/openrocket/gui/simulation/SimulationPlotPanel.java b/swing/src/net/sf/openrocket/gui/simulation/SimulationPlotPanel.java
index d881025a5..938f5948d 100644
--- a/swing/src/net/sf/openrocket/gui/simulation/SimulationPlotPanel.java
+++ b/swing/src/net/sf/openrocket/gui/simulation/SimulationPlotPanel.java
@@ -172,7 +172,7 @@ public class SimulationPlotPanel extends JPanel {
 		
 		//// X axis type:
 		this.add(new JLabel(trans.get("simplotpanel.lbl.Xaxistype")), "spanx, split");
-		domainTypeSelector = new JComboBox<FlightDataType>(types);
+		domainTypeSelector = FlightDataComboBox.createComboBox(FlightDataTypeGroup.ALL_GROUPS, types);
 		domainTypeSelector.setSelectedItem(configuration.getDomainAxisType());
 		domainTypeSelector.addItemListener(new ItemListener() {
 			@Override