diff --git a/android/src/net/sf/openrocket/android/rocket/MotorConfigSpinnerAdapter.java b/android/src/net/sf/openrocket/android/rocket/MotorConfigSpinnerAdapter.java
new file mode 100644
index 000000000..8c7bdf4bb
--- /dev/null
+++ b/android/src/net/sf/openrocket/android/rocket/MotorConfigSpinnerAdapter.java
@@ -0,0 +1,21 @@
+package net.sf.openrocket.android.rocket;
+
+import net.sf.openrocket.R;
+import net.sf.openrocket.rocketcomponent.Rocket;
+import android.content.Context;
+import android.widget.ArrayAdapter;
+
+public class MotorConfigSpinnerAdapter extends ArrayAdapter<String> {
+
+	public MotorConfigSpinnerAdapter(Context context, Rocket rocket) {
+		super(context, R.layout.simple_spinner_item);
+		
+		String[] motorConfigs = rocket.getMotorConfigurationIDs();
+
+		for( String config: motorConfigs ) {
+			this.add(rocket.getMotorConfigurationNameOrDescription(config));
+		}
+		
+	}
+
+}
diff --git a/android/src/net/sf/openrocket/android/rocket/Overview.java b/android/src/net/sf/openrocket/android/rocket/Overview.java
index 8692abf5a..e3c6dd55f 100644
--- a/android/src/net/sf/openrocket/android/rocket/Overview.java
+++ b/android/src/net/sf/openrocket/android/rocket/Overview.java
@@ -81,11 +81,7 @@ implements SharedPreferences.OnSharedPreferenceChangeListener
 		final Configuration rocketConfiguration = rocketDocument.getDefaultConfiguration();
 		Rocket rocket = rocketDocument.getRocket();
 
-		String[] motorConfigs = rocket.getMotorConfigurationIDs();
-		ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<String>(getActivity(),R.layout.simple_spinner_item);
-		for( String config: motorConfigs ) {
-			spinnerAdapter.add(rocket.getMotorConfigurationNameOrDescription(config));
-		}
+		MotorConfigSpinnerAdapter spinnerAdapter = new MotorConfigSpinnerAdapter(getActivity(),rocket);
 
 		AndroidLogWrapper.d(Overview.class, "spinnerAdapter = " + spinnerAdapter);
 		AndroidLogWrapper.d(Overview.class, "configurationSpinner = " + configurationSpinner);