diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/SetupActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/login/SetupActivity.java
index d2dff6a28e35e88ed559dcb283831fb1788f0d0d..f91c57512f1c02e9a53d591d17f7dbdfbc68154e 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/login/SetupActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/login/SetupActivity.java
@@ -15,6 +15,7 @@ import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+import static android.content.Intent.FLAG_ACTIVITY_TASK_ON_HOME;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -94,7 +95,7 @@ public class SetupActivity extends BaseActivity
 
 	void showApp() {
 		Intent i = new Intent(this, OpenDatabaseActivity.class);
-		i.setFlags(FLAG_ACTIVITY_NEW_TASK);
+		i.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_TASK_ON_HOME);
 		startActivity(i);
 		supportFinishAfterTransition();
 		overridePendingTransition(R.anim.screen_new_in, R.anim.screen_old_out);