diff --git a/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java b/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java
index 2ab9b63e2..7f341dd61 100644
--- a/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java
+++ b/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java
@@ -48,8 +48,6 @@ implements Simulations.OnSimulationSelectedListener
 		ViewPager viewPager = (ViewPager)findViewById(R.id.pager);
 		viewPagerAdapter = new OpenRocketViewerPagerAdapter( this.getSupportFragmentManager() );
 		viewPager.setAdapter( viewPagerAdapter );
-
-		CurrentRocketHolder.getCurrentRocket().setHandler( new RocketChangedEventHandler( ) );
 	}
 
 	@Override
@@ -58,6 +56,12 @@ implements Simulations.OnSimulationSelectedListener
 		super.onPause();
 	}
 
+	@Override
+	protected void onResume() {
+		CurrentRocketHolder.getCurrentRocket().setHandler( new RocketChangedEventHandler( ) );
+		super.onResume();
+	}
+
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		MenuInflater inflater = getSupportMenuInflater();