diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties
index a8c1cb10f..6f870c960 100644
--- a/core/resources/l10n/messages.properties
+++ b/core/resources/l10n/messages.properties
@@ -2151,7 +2151,9 @@ ExportDecalDialog.source.exception = Could not find decal source file ''{0}''.<b
 ComponentPresetChooserDialog.title = Choose component preset
 ComponentPresetChooserDialog.filter.label = Filter by text:
 ComponentPresetChooserDialog.checkbox.filterAftDiameter = Match aft diameter
+ComponentPresetChooserDialog.checkbox.filterAftDiameter.ttip = Search for components with the same aft diameter as the next component
 ComponentPresetChooserDialog.checkbox.filterForeDiameter = Match fore diameter
+ComponentPresetChooserDialog.checkbox.filterForeDiameter.ttip = Search for components with the same fore diameter as the previous component
 ComponentPresetChooserDialog.menu.sortAsc = Sort Ascending
 ComponentPresetChooserDialog.menu.sortDesc = Sort Descending
 ComponentPresetChooserDialog.menu.units = Units
diff --git a/core/src/net/sf/openrocket/rocketcomponent/NoseCone.java b/core/src/net/sf/openrocket/rocketcomponent/NoseCone.java
index 1bbaefc1e..b5a2d6e80 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/NoseCone.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/NoseCone.java
@@ -270,9 +270,12 @@ public class NoseCone extends Transition implements InsideColorComponent {
 
 	@Override
 	protected void loadFromPreset(ComponentPreset preset) {
+		// We first need to unflip, because the preset loading always applies settings for a normal nose cone (e.g. aft diameter)
+		boolean flipped = isFlipped;
 		setFlipped(false);
 		//Many parameters are handled by the super class Transition.loadFromPreset
 		super.loadFromPreset(preset);
+		setFlipped(flipped);
 	}
 
 	/**
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java
index 9c0854d24..bdc5230a1 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java
@@ -35,6 +35,7 @@ import net.sf.openrocket.gui.util.SwingPreferences;
 import net.sf.openrocket.l10n.Translator;
 import net.sf.openrocket.preset.ComponentPreset;
 import net.sf.openrocket.preset.TypedKey;
+import net.sf.openrocket.rocketcomponent.NoseCone;
 import net.sf.openrocket.rocketcomponent.RocketComponent;
 import net.sf.openrocket.rocketcomponent.SymmetricComponent;
 import net.sf.openrocket.startup.Application;
@@ -257,6 +258,7 @@ public class ComponentPresetChooserDialog extends JDialog {
 			 * Add filter by fore diameter
 			 */
 			foreDiameterFilterCheckBox = new JCheckBox(trans.get("ComponentPresetChooserDialog.checkbox.filterForeDiameter"));
+			foreDiameterFilterCheckBox.setToolTipText(trans.get("ComponentPresetChooserDialog.checkbox.filterForeDiameter.ttip"));
 			final SymmetricComponent prevSym = curSym.getPreviousSymmetricComponent();
 			if (prevSym != null && foreDiameterColumnIndex >= 0) {
 				foreDiameterFilterCheckBox.setSelected(preferences.isMatchForeDiameter());
@@ -274,8 +276,16 @@ public class ComponentPresetChooserDialog extends JDialog {
 			/*
 			 * Add filter by aft diameter
 			 */
-			aftDiameterFilterCheckBox = new JCheckBox(trans.get("ComponentPresetChooserDialog.checkbox.filterAftDiameter"));
-			final SymmetricComponent nextSym = curSym.getNextSymmetricComponent();
+			final SymmetricComponent nextSym;
+			if (curSym instanceof NoseCone && ((NoseCone) curSym).isFlipped()) {
+				aftDiameterFilterCheckBox = new JCheckBox(trans.get("ComponentPresetChooserDialog.checkbox.filterForeDiameter"));
+				aftDiameterFilterCheckBox.setToolTipText(trans.get("ComponentPresetChooserDialog.checkbox.filterForeDiameter.ttip"));
+				nextSym = curSym.getPreviousSymmetricComponent();
+			} else {
+				aftDiameterFilterCheckBox = new JCheckBox(trans.get("ComponentPresetChooserDialog.checkbox.filterAftDiameter"));
+				aftDiameterFilterCheckBox.setToolTipText(trans.get("ComponentPresetChooserDialog.checkbox.filterAftDiameter.ttip"));
+				nextSym = curSym.getNextSymmetricComponent();
+			}
 			if (nextSym != null && aftDiameterColumnIndex >= 0) {
 				aftDiameterFilterCheckBox.setSelected(preferences.isMatchAftDiameter());
 				aftDiameterFilter = new ComponentPresetRowFilter(nextSym.getForeRadius() * 2.0, aftDiameterColumnIndex);