diff --git a/app/src/androidTest/java/com.nutomic.zertman.test/MainActivityTest.java b/app/src/androidTest/java/com.nutomic.zertman.test/MainActivityTest.java
index 45ed03e..b4d906b 100644
--- a/app/src/androidTest/java/com.nutomic.zertman.test/MainActivityTest.java
+++ b/app/src/androidTest/java/com.nutomic.zertman.test/MainActivityTest.java
@@ -30,17 +30,12 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv
 
 	@SmallTest
 	public void testOrientation() {
-		try {
-			mActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-			Thread.sleep(50);
-			assertTrue(true);
-			mActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-			Thread.sleep(50);
-			assertTrue(true);
-		}
-		catch (InterruptedException e) {
-			Log.w(TAG, "Sleep failed", e);
-		}
+		mActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+		getInstrumentation().waitForIdleSync();
+		assertTrue(true);
+		mActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+		getInstrumentation().waitForIdleSync();
+		assertTrue(true);
 	}
 
 }
diff --git a/app/src/main/java/com/nutomic/zertman/MainActivity.java b/app/src/main/java/com/nutomic/zertman/MainActivity.java
index efbcd66..5b9d064 100644
--- a/app/src/main/java/com/nutomic/zertman/MainActivity.java
+++ b/app/src/main/java/com/nutomic/zertman/MainActivity.java
@@ -1,9 +1,13 @@
 package com.nutomic.zertman;
 
+import android.app.AlertDialog;
 import android.app.ListActivity;
+import android.content.DialogInterface;
 import android.os.Bundle;
 import android.widget.ListView;
 
+import java.util.List;
+
 
 public class MainActivity extends ListActivity {
 
@@ -32,4 +36,25 @@ public class MainActivity extends ListActivity {
 	    mListView.setAdapter(mCertificateAdapter);
     }
 
+	@Override
+	protected void onResume() {
+		super.onResume();
+		final List<Certificate> list = mCertificateManager.getCertificates(false);
+		if (!list.isEmpty()) {
+			new AlertDialog.Builder(this)
+					.setTitle(R.string.dialog_move_certs_title)
+					.setMessage(R.string.dialog_move_certs_message)
+					.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
+						@Override
+						public void onClick(DialogInterface dialog, int which) {
+							for (Certificate c : list) {
+								mCertificateManager.moveCertificateToSystem(c);
+								mMovedCertificatesStorage.insert(c);
+							}
+						}
+					})
+					.setNegativeButton(android.R.string.no, null)
+					.show();
+		}
+	}
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4ca734f..9cc5693 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,4 +3,8 @@
 
     <string name="app_name">Zert Man</string>
 
+	<string name="dialog_move_certs_title">User Certificates Found</string>
+
+	<string name="dialog_move_certs_message">Should they be moved to system storage?</string>
+
 </resources>