diff --git a/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java b/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
index 5d8cd2e53..423f23d25 100644
--- a/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
@@ -1006,7 +1006,7 @@ public class SimulationPanel extends JPanel {
 	 */
 	public void takeTheSpotlight() {
 		simulationTable.requestFocusInWindow();
-		if (simulationTable.getSelectedRows().length > 0) {
+		if (simulationTable.getRowCount() == 0 || simulationTable.getSelectedRows().length > 0) {
 			return;
 		}
 		if (previousSelection == null || previousSelection.length == 0) {