diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
index 1af0847c..bb4fffd7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
@@ -156,7 +156,6 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener {
                 handlePermission(PERMISSION_WRITE_STORAGE) {
                     if (it) {
                         initializeCamera()
-                        handleIntent()
                     } else {
                         toast(R.string.no_storage_permissions)
                         finish()
@@ -178,6 +177,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener {
             }
         } else if (intent?.action == MediaStore.ACTION_VIDEO_CAPTURE) {
             mIsVideoCaptureIntent = true
+            mIsInPhotoMode = false
             hideIntentButtons()
             shutter.setImageResource(R.drawable.ic_video_rec)
         }
@@ -190,12 +190,13 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener {
         setContentView(R.layout.activity_main)
         initButtons()
 
+        handleIntent()
         camera_surface_view.beVisibleIf(!isLollipopPlus())
         camera_texture_view.beVisibleIf(isLollipopPlus())
 
         (btn_holder.layoutParams as RelativeLayout.LayoutParams).setMargins(0, 0, 0, (navBarHeight + resources.getDimension(R.dimen.activity_margin)).toInt())
 
-        mPreview = if (isLollipopPlus()) PreviewCameraTwo(this, camera_texture_view) else PreviewCameraOne(this, camera_surface_view)
+        mPreview = if (isLollipopPlus()) PreviewCameraTwo(this, camera_texture_view, mIsInPhotoMode) else PreviewCameraOne(this, camera_surface_view)
         view_holder.addView(mPreview as ViewGroup)
 
         val imageDrawable = if (config.lastUsedCamera == mCameraImpl.getBackCameraId().toString()) R.drawable.ic_camera_front else R.drawable.ic_camera_rear
diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/views/PreviewCameraTwo.kt b/app/src/main/kotlin/com/simplemobiletools/camera/views/PreviewCameraTwo.kt
index 0968aa2f..6b0c8105 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/views/PreviewCameraTwo.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/views/PreviewCameraTwo.kt
@@ -112,7 +112,7 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie
     constructor(context: Context) : super(context)
 
     @SuppressLint("ClickableViewAccessibility")
-    constructor(activity: MainActivity, textureView: AutoFitTextureView) : super(activity) {
+    constructor(activity: MainActivity, textureView: AutoFitTextureView, initPhotoMode: Boolean) : super(activity) {
         mActivity = activity
         mTextureView = textureView
         val cameraCharacteristics = try {
@@ -123,7 +123,7 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie
 
         val isFrontCamera = cameraCharacteristics?.get(CameraCharacteristics.LENS_FACING).toString() == activity.getMyCamera().getFrontCameraId().toString()
         mUseFrontCamera = !activity.config.alwaysOpenBackCamera && isFrontCamera
-        mIsInVideoMode = !activity.config.initPhotoMode
+        mIsInVideoMode = !initPhotoMode
         loadSounds()
 
         mTextureView.setOnTouchListener { view, event ->