diff --git a/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesFragment.java
index 8fba2187cf32a26e63ed43bc4d3b2f8c81af7bbc..f5184f5d80af7976c7d8f8d2ba385517c0161338 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesFragment.java
@@ -128,7 +128,12 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat
 							Intent intent = new Intent(Intent.ACTION_VIEW);
 							intent.setData(Uri.parse(
 									"market://details?id=info.guardianproject.ripple"));
-							startActivity(intent);
+							intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+							if (intent.resolveActivity(
+									getActivity().getPackageManager()) !=
+									null) {
+								startActivity(intent);
+							}
 							return true;
 						}
 					});
@@ -236,7 +241,7 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat
 				};
 
 		AlertDialog.Builder builder = new AlertDialog.Builder(getContext(),
-						R.style.BriarDialogTheme);
+				R.style.BriarDialogTheme);
 		builder.setTitle(getString(R.string.dialog_title_connect_panic_app));
 
 		CharSequence app = getString(R.string.unknown_app);