diff --git a/app/src/main/java/com/simplemobiletools/camera/MainActivity.java b/app/src/main/java/com/simplemobiletools/camera/MainActivity.java
index 098bde37..44de0caa 100644
--- a/app/src/main/java/com/simplemobiletools/camera/MainActivity.java
+++ b/app/src/main/java/com/simplemobiletools/camera/MainActivity.java
@@ -78,6 +78,7 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
                 isVideoCaptureIntent = true;
                 hideToggleModeAbout();
                 preview.trySwitchToVideo();
+                preview.setIsVideoCaptureIntent();
                 shutterBtn.setImageDrawable(getResources().getDrawable(R.mipmap.video_rec));
             }
         }
@@ -397,6 +398,17 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
         return orientation;
     }
 
+    @Override
+    public void videoSaved(Uri uri) {
+        if (isVideoCaptureIntent) {
+            final Intent intent = new Intent();
+            intent.setData(uri);
+            intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+            setResult(RESULT_OK, intent);
+            finish();
+        }
+    }
+
     @Override
     public void mediaSaved() {
         if (isImageCaptureIntent) {
diff --git a/app/src/main/java/com/simplemobiletools/camera/Preview.java b/app/src/main/java/com/simplemobiletools/camera/Preview.java
index 35eab794..b606a77d 100644
--- a/app/src/main/java/com/simplemobiletools/camera/Preview.java
+++ b/app/src/main/java/com/simplemobiletools/camera/Preview.java
@@ -6,6 +6,7 @@ import android.hardware.Camera;
 import android.media.CamcorderProfile;
 import android.media.MediaPlayer;
 import android.media.MediaRecorder;
+import android.media.MediaScannerConnection;
 import android.net.Uri;
 import android.os.Handler;
 import android.util.Log;
@@ -22,7 +23,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.OnTouchListener, OnLongClickListener, View.OnClickListener {
+public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.OnTouchListener, OnLongClickListener, View.OnClickListener,
+        MediaScannerConnection.OnScanCompletedListener {
     private static final String TAG = Preview.class.getSimpleName();
     private static final int FOCUS_AREA_SIZE = 200;
     private static final int PHOTO_PREVIEW_LENGTH = 1000;
@@ -44,6 +46,7 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
     private static boolean isVideoMode;
     private static boolean isSurfaceCreated;
     private static boolean switchToVideoAsap;
+    private static boolean isVideoCaptureIntent;
     private static String curVideoPath;
     private static int lastClickX;
     private static int lastClickY;
@@ -81,6 +84,10 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
         }
     }
 
+    public void setIsVideoCaptureIntent() {
+        isVideoCaptureIntent = true;
+    }
+
     public boolean setCamera(int cameraId) {
         currCameraId = cameraId;
         Camera newCamera;
@@ -549,7 +556,8 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
         if (recorder != null && isRecording) {
             try {
                 recorder.stop();
-                Utils.scanFile(curVideoPath, getContext());
+                final String[] paths = {curVideoPath};
+                MediaScannerConnection.scanFile(getContext(), paths, null, isVideoCaptureIntent ? this : null);
             } catch (RuntimeException e) {
                 new File(curVideoPath).delete();
                 Utils.showToast(getContext(), R.string.video_saving_error);
@@ -578,6 +586,11 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
         focusArea();
     }
 
+    @Override
+    public void onScanCompleted(String path, Uri uri) {
+        callback.videoSaved(uri);
+    }
+
     public interface PreviewListener {
         void setFlashAvailable(boolean available);
 
@@ -586,5 +599,7 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
         void activateShutter();
 
         int getCurrentOrientation();
+
+        void videoSaved(Uri uri);
     }
 }