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 9f24c9e88..8e2e77378 100644
--- a/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java
@@ -178,9 +178,15 @@ public class ViewPagerActivity extends SimpleActivity
     }
 
     private void openEditor() {
-        final Intent intent = new Intent(getApplicationContext(), EditActivity.class);
-        intent.setData(Uri.fromFile(getCurrentFile()));
-        startActivityForResult(intent, EDIT_IMAGE);
+        final Intent intent = new Intent(Intent.ACTION_EDIT);
+        intent.setDataAndType(Uri.fromFile(getCurrentFile()), "image/*");
+        final Intent chooser = Intent.createChooser(intent, getString(R.string.edit_image_with));
+
+        if (intent.resolveActivity(getPackageManager()) != null) {
+            startActivityForResult(chooser, EDIT_IMAGE);
+        } else {
+            Utils.showToast(getApplicationContext(), R.string.no_editor_found);
+        }
     }
 
     @Override
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 73a392aab..b974f4f72 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -50,6 +50,8 @@
     <string name="image_croping_failed">Image croping failed:</string>
     <string name="invalid_image_path">Invalid image path</string>
     <string name="image_editing_failed">Image editing failed</string>
+    <string name="edit_image_with">Edit image with:</string>
+    <string name="no_editor_found">No image editor found</string>
 
     <!-- About -->
     <string name="about">Über</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 09705e7e9..4c7932d59 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -50,6 +50,8 @@
     <string name="image_croping_failed">Image croping failed:</string>
     <string name="invalid_image_path">Invalid image path</string>
     <string name="image_editing_failed">Image editing failed</string>
+    <string name="edit_image_with">Edit image with:</string>
+    <string name="no_editor_found">No image editor found</string>
 
     <!-- About -->
     <string name="about">Acerca de</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 69ef747a2..979dcc113 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -50,6 +50,8 @@
     <string name="image_croping_failed">Image croping failed:</string>
     <string name="invalid_image_path">Invalid image path</string>
     <string name="image_editing_failed">Image editing failed</string>
+    <string name="edit_image_with">Edit image with:</string>
+    <string name="no_editor_found">No image editor found</string>
 
     <!-- About -->
     <string name="about">Informazioni</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 265a423c0..ed892d33a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -50,6 +50,8 @@
     <string name="image_croping_failed">Image croping failed:</string>
     <string name="invalid_image_path">Invalid image path</string>
     <string name="image_editing_failed">Image editing failed</string>
+    <string name="edit_image_with">Edit image with:</string>
+    <string name="no_editor_found">No image editor found</string>
 
     <!-- About -->
     <string name="about">アプリについて</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 8a3f7fbee..12c26f151 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -50,6 +50,8 @@
     <string name="image_croping_failed">Image croping failed:</string>
     <string name="invalid_image_path">Invalid image path</string>
     <string name="image_editing_failed">Image editing failed</string>
+    <string name="edit_image_with">Edit image with:</string>
+    <string name="no_editor_found">No image editor found</string>
 
     <!-- About -->
     <string name="about">Sobre</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index ba2097d03..fee317844 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -50,6 +50,8 @@
     <string name="image_croping_failed">Image croping failed:</string>
     <string name="invalid_image_path">Invalid image path</string>
     <string name="image_editing_failed">Image editing failed</string>
+    <string name="edit_image_with">Edit image with:</string>
+    <string name="no_editor_found">No image editor found</string>
 
     <!-- About -->
     <string name="about">Om</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1be212722..acfb84816 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -50,6 +50,8 @@
     <string name="image_croping_failed">Image croping failed:</string>
     <string name="invalid_image_path">Invalid image path</string>
     <string name="image_editing_failed">Image editing failed</string>
+    <string name="edit_image_with">Edit image with:</string>
+    <string name="no_editor_found">No image editor found</string>
 
     <!-- About -->
     <string name="about">About</string>