diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7663fad87..460b9da2b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -53,7 +53,19 @@
 
         <activity
             android:name=".activities.ViewPagerActivity"
-            android:theme="@style/FullScreenTheme"/>
+            android:theme="@style/FullScreenTheme">
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <action android:name="com.android.camera.action.REVIEW"/>
+
+                <category android:name="android.intent.category.BROWSABLE"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+
+                <data android:mimeType="image/*"/>
+                <data android:mimeType="video/*"/>
+            </intent-filter>
+        </activity>
 
         <activity
             android:name=".activities.AboutActivity"
diff --git a/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java b/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java
index 54f60f3d5..7cc93a903 100644
--- a/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java
@@ -66,6 +66,30 @@ public class ViewPagerActivity extends AppCompatActivity
             return;
         }
 
+        final Uri uri = getIntent().getData();
+        if (uri != null) {
+            Cursor cursor = null;
+            try {
+                final String[] proj = {MediaStore.Images.Media.DATA};
+                cursor = getContentResolver().query(uri, proj, null, null, null);
+                final int dataIndex = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+                cursor.moveToFirst();
+                mPath = cursor.getString(dataIndex);
+            } finally {
+                if (cursor != null) {
+                    cursor.close();
+                }
+            }
+        } else {
+            mPath = getIntent().getStringExtra(Constants.MEDIUM);
+        }
+
+        if (mPath == null || mPath.isEmpty()) {
+            Utils.showToast(getApplicationContext(), R.string.unknown_error);
+            finish();
+            return;
+        }
+
         mPos = 0;
         mIsFullScreen = true;
         mActionbar = getSupportActionBar();
@@ -73,7 +97,6 @@ public class ViewPagerActivity extends AppCompatActivity
         mBeingDeleted = "";
         hideSystemUI();
 
-        mPath = getIntent().getStringExtra(Constants.MEDIUM);
         MediaScannerConnection.scanFile(this, new String[]{mPath}, null, null);
         addUndoMargin();
         mDirectory = new File(mPath).getParent();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index eb4e5a0a1..08f448a29 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,6 +19,7 @@
     <string name="file_deleted">File deleted</string>
     <string name="setting_wallpaper">Setting wallpaper</string>
     <string name="open_camera">Open camera</string>
+    <string name="unknown_error">An unknown error occurred</string>
 
     <plurals name="folders_deleted">
         <item quantity="one">1 folder deleted</item>