diff --git a/briar-android/src/main/AndroidManifest.xml b/briar-android/src/main/AndroidManifest.xml
index 08c1c9bd2..e5615274c 100644
--- a/briar-android/src/main/AndroidManifest.xml
+++ b/briar-android/src/main/AndroidManifest.xml
@@ -481,6 +481,15 @@
 				android:value="org.briarproject.briar.android.settings.SettingsActivity" />
 		</activity>
 
+		<activity
+			android:name="org.briarproject.briar.android.remotewipe.activate.ActivateRemoteWipeActivity"
+			android:label="@string/activity_name_activate_remote_wipe"
+			android:parentActivityName="org.briarproject.briar.android.conversation.ConversationActivity">
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.briarproject.briar.android.conversation.ConversationActivity" />
+		</activity>
+
 		<activity
 			android:name="org.briarproject.briar.android.logout.ExitActivity"
 			android:theme="@android:style/Theme.NoDisplay" />
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index b786b2c37..b67e3f151 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -751,6 +751,7 @@
 	<string name="activate_remote_wipe">Activate remote wipe</string>
 
 	<!-- activate -->
+	<string name="activity_name_activate_remote_wipe">Activate Remote Wipe</string>
 	<string name="remote_wipe_activate_success">Remote wipe signal sent</string>
 	<string name="remote_wipe_activate_failure">Failed to send remote wipe signal</string>
 	<string name="remote_wipe_activate_button_confirm">Activate remote wipe</string>