diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 75a70dc68a50ab674f52fe955a747201371bf138..57b47934bf0eedd6633548c22f1c78f2070516fb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -100,6 +100,18 @@
             android:exported="false"
             >
         </activity>
+
+        <activity
+            android:name="net.sourceforge.opencamera.qr.QrScannerActivity"
+            android:configChanges="orientation|screenLayout|screenSize|smallestScreenSize|keyboardHidden"
+            android:exported="true"
+            android:excludeFromRecents="true"
+            android:launchMode="singleInstance"
+            android:screenOrientation="nosensor"
+            android:visibleToInstantApps="true"
+            android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
+        </activity>
+
         <!-- should not change the android:name, including moving to a subpackage - see http://android-developers.blogspot.co.uk/2011/06/things-that-cannot-change.html -->
         <receiver
             android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/net/sourceforge/opencamera/preview/Preview.java b/app/src/main/java/net/sourceforge/opencamera/preview/Preview.java
index 3ffe7fee8de86bba4c3791944416b471242ae27b..79da1fd80bf9e436ad804e92c4c90d29b7a27422 100644
--- a/app/src/main/java/net/sourceforge/opencamera/preview/Preview.java
+++ b/app/src/main/java/net/sourceforge/opencamera/preview/Preview.java
@@ -14,7 +14,6 @@ import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Matrix;
-import android.graphics.Paint;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.RectF;
@@ -61,6 +60,14 @@ import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 import androidx.core.content.ContextCompat;
 
+import com.google.zxing.BinaryBitmap;
+import com.google.zxing.LuminanceSource;
+import com.google.zxing.MultiFormatReader;
+import com.google.zxing.RGBLuminanceSource;
+import com.google.zxing.Reader;
+import com.google.zxing.Result;
+import com.google.zxing.common.HybridBinarizer;
+
 import net.sourceforge.opencamera.MainActivity;
 import net.sourceforge.opencamera.MyDebug;
 import net.sourceforge.opencamera.ScriptC_histogram_compute;
@@ -94,14 +101,6 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import com.google.zxing.BinaryBitmap;
-import com.google.zxing.LuminanceSource;
-import com.google.zxing.MultiFormatReader;
-import com.google.zxing.Reader;
-import com.google.zxing.Result;
-import com.google.zxing.common.HybridBinarizer;
-import com.google.zxing.RGBLuminanceSource;
-
 import foundation.e.camera.R;
 
 /** This class was originally named due to encapsulating the camera preview,
@@ -4775,22 +4774,10 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
             if (video_recorder != null) {
                 stopVideo(false);
             }
-            this.functionalMode = FunctionalMode.QRCODE;
-            final Activity activity = (Activity) Preview.this.getContext();
-            final FrameLayout rootLayout = activity.findViewById(android.R.id.content);
-            rootLayout.addView(overlayQRCodeView);
-            int qrcodeCamId = ((MainActivity)getContext()).getBetterQRCodeCameraID();
-            if (qrcodeCamId >= 0) {
-                applicationInterface.setCameraIdPref(qrcodeCamId);
-                //userSwitchToCamera(qrcodeCamId, true);
-            }
+            setQRCode(true);
         } else if (this.is_qrcode()) {
             this.functionalMode = FunctionalMode.PHOTO;
-            final Activity activity = (Activity) Preview.this.getContext();
-            final FrameLayout rootLayout = activity.findViewById(android.R.id.content);
-            if (overlayQRCodeView.getParent() != null) {
-                rootLayout.removeView(overlayQRCodeView);
-            }
+            setQRCode(false);
         } else if (this.is_photo()) {
             if (this.isOnTimer()) {
                 cancelTimer();
@@ -8654,6 +8641,21 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
         }
     }
 
+    public void setQRCode(boolean enabled) {
+        final Activity activity = (Activity) Preview.this.getContext();
+        final FrameLayout rootLayout = activity.findViewById(android.R.id.content);
+        if (enabled) {
+            this.functionalMode = FunctionalMode.QRCODE;
+            rootLayout.addView(overlayQRCodeView);
+            int qrcodeCamId = ((MainActivity)getContext()).getBetterQRCodeCameraID();
+            if (qrcodeCamId >= 0) {
+                applicationInterface.setCameraIdPref(qrcodeCamId);
+            }
+        } else if (overlayQRCodeView.getParent() != null) {
+            rootLayout.removeView(overlayQRCodeView);
+        }
+    }
+
     public boolean isQRCode() {
         return functionalMode == FunctionalMode.QRCODE;
     }
diff --git a/app/src/main/java/net/sourceforge/opencamera/qr/QrScannerActivity.kt b/app/src/main/java/net/sourceforge/opencamera/qr/QrScannerActivity.kt
new file mode 100644
index 0000000000000000000000000000000000000000..94a501b74debf8f08e94294b7d6694e72f429b5e
--- /dev/null
+++ b/app/src/main/java/net/sourceforge/opencamera/qr/QrScannerActivity.kt
@@ -0,0 +1,11 @@
+package net.sourceforge.opencamera.qr
+
+import android.os.Bundle
+import net.sourceforge.opencamera.MainActivity
+
+class QrScannerActivity : MainActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        preview.setQRCode(true)
+    }
+}