diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b665854b..5b1db238 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,7 +29,7 @@
 		<activity
 			android:name=".activity.CameraActivity"
 			android:label="@string/scan_code">
-			<intent-filter>
+			<intent-filter android:label="@string/compose_barcode">
 				<action android:name="android.intent.action.SEND"/>
 				<category android:name="android.intent.category.DEFAULT"/>
 				<data android:mimeType="text/plain"/>
diff --git a/app/src/main/kotlin/de/markusfisch/android/binaryeye/activity/CameraActivity.kt b/app/src/main/kotlin/de/markusfisch/android/binaryeye/activity/CameraActivity.kt
index b66f658b..b9ced3cd 100644
--- a/app/src/main/kotlin/de/markusfisch/android/binaryeye/activity/CameraActivity.kt
+++ b/app/src/main/kotlin/de/markusfisch/android/binaryeye/activity/CameraActivity.kt
@@ -113,6 +113,7 @@ class CameraActivity : AppCompatActivity() {
 		returnResult = "com.google.zxing.client.android.SCAN".equals(
 			intent.action
 		)
+		handleSendText(intent)
 		if (hasCameraPermission()) {
 			cameraView.openAsync(
 				CameraView.findCameraId(
@@ -183,7 +184,8 @@ class CameraActivity : AppCompatActivity() {
 		// consume this intent
 		intent.setAction(null)
 
-		startActivity(MainActivity.getEncodeIntent(this, text))
+		startActivity(MainActivity.getEncodeIntent(this, text, true))
+		finish()
 	}
 
 	private fun hasCameraPermission(): Boolean {
diff --git a/app/src/main/kotlin/de/markusfisch/android/binaryeye/activity/MainActivity.kt b/app/src/main/kotlin/de/markusfisch/android/binaryeye/activity/MainActivity.kt
index 58b25d20..3a3d4189 100644
--- a/app/src/main/kotlin/de/markusfisch/android/binaryeye/activity/MainActivity.kt
+++ b/app/src/main/kotlin/de/markusfisch/android/binaryeye/activity/MainActivity.kt
@@ -59,9 +59,14 @@ class MainActivity : AppCompatActivity() {
 		private const val DECODE = "decode"
 		private const val DECODE_FORMAT = "decode_format"
 
-		fun getEncodeIntent(context: Context, text: String? = ""): Intent {
+		fun getEncodeIntent(context: Context, text: String? = "", external: Boolean = false): Intent {
 			val intent = Intent(context, MainActivity::class.java)
 			intent.putExtra(ENCODE, text)
+			if (external) {
+				intent.addFlags(android.content.Intent.FLAG_ACTIVITY_NO_HISTORY or
+						android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK or
+						android.content.Intent.FLAG_ACTIVITY_NEW_TASK)
+			}
 			return intent
 		}