diff --git a/core/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java b/core/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java
index e82577453..d501f7e83 100644
--- a/core/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java
+++ b/core/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java
@@ -155,6 +155,7 @@ public class ComponentPresetChooserDialog extends JDialog {
 		if (!okClicked)
 			return null;
 		int row = componentSelectionTable.getSelectedRow();
+		row = componentSelectionTable.convertRowIndexToModel(row);
 		return presets.get(row);
 	}