diff --git a/swing/src/main/java/info/openrocket/swing/gui/simulation/FlightDataComboBox.java b/swing/src/main/java/info/openrocket/swing/gui/simulation/FlightDataComboBox.java
index 8fad7baaa..b1e0932e9 100644
--- a/swing/src/main/java/info/openrocket/swing/gui/simulation/FlightDataComboBox.java
+++ b/swing/src/main/java/info/openrocket/swing/gui/simulation/FlightDataComboBox.java
@@ -7,12 +7,7 @@ import info.openrocket.core.simulation.FlightDataTypeGroup;
 import info.openrocket.core.startup.Application;
 
 import javax.swing.JComboBox;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 
 public class FlightDataComboBox extends JComboBox<FlightDataType> {
 	private static final Translator trans = Application.getTranslator();
@@ -20,33 +15,4 @@ public class FlightDataComboBox extends JComboBox<FlightDataType> {
 	public static GroupableAndSearchableComboBox<FlightDataTypeGroup, FlightDataType> createComboBox(List<FlightDataType> types) {
 		return new GroupableAndSearchableComboBox<>(types, trans.get("FlightDataComboBox.placeholder"));
 	}
-
-	/**
-	 * Create a map of flight data group and corresponding flight data types.
-	 * @param groups the groups
-	 * @param types the types
-	 * @return the map linking the types to their groups
-	 */
-	private static Map<FlightDataTypeGroup, List<FlightDataType>> createFlightDataGroupMap(
-			FlightDataTypeGroup[] groups, FlightDataType[] types) {
-		// Sort the groups based on priority (lower number = higher priority)
-		FlightDataTypeGroup[] sortedGroups = groups.clone();
-		Arrays.sort(sortedGroups, Comparator.comparingInt(FlightDataTypeGroup::getPriority));
-
-		Map<FlightDataTypeGroup, List<FlightDataType>> map = new LinkedHashMap<>();
-		for (FlightDataTypeGroup group : sortedGroups) {
-			List<FlightDataType> itemsForGroup = new ArrayList<>();
-			for (FlightDataType type : types) {
-				if (type.getGroup().equals(group)) {
-					itemsForGroup.add(type);
-				}
-			}
-			// Sort the types within each group based on priority
-			itemsForGroup.sort(Comparator.comparingInt(FlightDataType::getGroupPriority));
-
-			map.put(group, itemsForGroup);
-		}
-
-		return map;
-	}
 }
diff --git a/swing/src/main/java/info/openrocket/swing/gui/widgets/GroupableAndSearchableComboBox.java b/swing/src/main/java/info/openrocket/swing/gui/widgets/GroupableAndSearchableComboBox.java
index 7fef1cf9a..889057329 100644
--- a/swing/src/main/java/info/openrocket/swing/gui/widgets/GroupableAndSearchableComboBox.java
+++ b/swing/src/main/java/info/openrocket/swing/gui/widgets/GroupableAndSearchableComboBox.java
@@ -267,7 +267,6 @@ public class GroupableAndSearchableComboBox<G extends Group, T extends Groupable
 					itemMenu.setSelected(item == GroupableAndSearchableComboBox.this.getSelectedItem());
 					itemMenu.addActionListener(e -> {
 						setSelectedItem(item);
-						fireActionEvent();
 					});
 					groupMenu.add(itemMenu);
 				}