diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 31b39e478..b1952f82b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -41,11 +41,6 @@
                 <data android:mimeType="vnd.android.cursor.dir/image"/>
                 <data android:mimeType="vnd.android.cursor.dir/video"/>
             </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.SET_WALLPAPER"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
         </activity>
 
         <activity
@@ -125,5 +120,23 @@
                 <data android:mimeType="image/*"/>
             </intent-filter>
         </activity>
+
+        <activity
+            android:name=".activities.SetWallpaperActivity"
+            android:label="@string/wallpaper">
+            <intent-filter>
+                <action android:name="android.intent.action.ATTACH_DATA"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+
+                <data android:mimeType="image/*"/>
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.SET_WALLPAPER"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
     </application>
 </manifest>
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SetWallpaperActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SetWallpaperActivity.kt
new file mode 100644
index 000000000..14201f1ac
--- /dev/null
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SetWallpaperActivity.kt
@@ -0,0 +1,12 @@
+package com.simplemobiletools.gallery.activities
+
+import android.os.Bundle
+import com.simplemobiletools.gallery.R
+
+class SetWallpaperActivity : SimpleActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_set_wallpaper)
+    }
+}
diff --git a/app/src/main/res/layout/activity_set_wallpaper.xml b/app/src/main/res/layout/activity_set_wallpaper.xml
new file mode 100644
index 000000000..93d6c62b4
--- /dev/null
+++ b/app/src/main/res/layout/activity_set_wallpaper.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/coordinator_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/black">
+
+</RelativeLayout>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1034ddc01..2c11a7dcf 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -30,8 +30,6 @@
     <string name="descending">Absteigend</string>
     <string name="ok">OK</string>
     <string name="cancel">Abbrechen</string>
-    <string name="set_as_wallpaper">Als Hintergrundbild setzen</string>
-    <string name="set_as_wallpaper_failed">Setzen des Hintergrundbildes fehlgeschlagen</string>
 
     <plurals name="folders_deleted">
         <item quantity="one">1 Ordner gelöscht</item>
@@ -56,6 +54,9 @@
     <string name="error_saving_file">Could not overwrite the source file</string>
 
     <!-- Set wallpaper -->
+    <string name="wallpaper">Wallpaper</string>
+    <string name="set_as_wallpaper">Als Hintergrundbild setzen</string>
+    <string name="set_as_wallpaper_failed">Setzen des Hintergrundbildes fehlgeschlagen</string>
     <string name="set_as_wallpaper_with">Set as wallpaper with:</string>
     <string name="no_wallpaper_setter_found">No app capable of it has been found</string>
     <string name="wallpaper_changed_successfully">Wallpaper changed successfully</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 3f4e5c935..f7cfa551f 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -30,8 +30,6 @@
     <string name="descending">Descendente</string>
     <string name="ok">Aceptar</string>
     <string name="cancel">Cancelar</string>
-    <string name="set_as_wallpaper">Establecer como fondo de pantalla</string>
-    <string name="set_as_wallpaper_failed">Error al establecer fondo de pantalla</string>
 
     <plurals name="folders_deleted">
         <item quantity="one">1 carpeta eliminada</item>
@@ -56,6 +54,9 @@
     <string name="error_saving_file">Could not overwrite the source file</string>
 
     <!-- Set wallpaper -->
+    <string name="wallpaper">Wallpaper</string>
+    <string name="set_as_wallpaper">Establecer como fondo de pantalla</string>
+    <string name="set_as_wallpaper_failed">Error al establecer fondo de pantalla</string>
     <string name="set_as_wallpaper_with">Set as wallpaper with:</string>
     <string name="no_wallpaper_setter_found">No app capable of it has been found</string>
     <string name="wallpaper_changed_successfully">Wallpaper changed successfully</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 20a569ef8..e3b61abee 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -30,8 +30,6 @@
     <string name="descending">Descending</string>
     <string name="ok">OK</string>
     <string name="cancel">Cancel</string>
-    <string name="set_as_wallpaper">Set as Wallpaper</string>
-    <string name="set_as_wallpaper_failed">Setting as Wallpaper failed</string>
 
     <plurals name="folders_deleted">
         <item quantity="one">1 cartella eliminata</item>
@@ -56,6 +54,9 @@
     <string name="error_saving_file">Could not overwrite the source file</string>
 
     <!-- Set wallpaper -->
+    <string name="wallpaper">Wallpaper</string>
+    <string name="set_as_wallpaper">Set as Wallpaper</string>
+    <string name="set_as_wallpaper_failed">Setting as Wallpaper failed</string>
     <string name="set_as_wallpaper_with">Set as wallpaper with:</string>
     <string name="no_wallpaper_setter_found">No app capable of it has been found</string>
     <string name="wallpaper_changed_successfully">Wallpaper changed successfully</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index a21b63ddc..f3eb86a7a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -30,8 +30,6 @@
     <string name="descending">Descending</string>
     <string name="ok">OK</string>
     <string name="cancel">Cancel</string>
-    <string name="set_as_wallpaper">Set as Wallpaper</string>
-    <string name="set_as_wallpaper_failed">Setting as Wallpaper failed</string>
 
     <plurals name="folders_deleted">
         <item quantity="one">1 フォルダーを削除しました</item>
@@ -56,6 +54,9 @@
     <string name="error_saving_file">Could not overwrite the source file</string>
 
     <!-- Set wallpaper -->
+    <string name="wallpaper">Wallpaper</string>
+    <string name="set_as_wallpaper">Set as Wallpaper</string>
+    <string name="set_as_wallpaper_failed">Setting as Wallpaper failed</string>
     <string name="set_as_wallpaper_with">Set as wallpaper with:</string>
     <string name="no_wallpaper_setter_found">No app capable of it has been found</string>
     <string name="wallpaper_changed_successfully">Wallpaper changed successfully</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index a96396dfd..d9f7ab405 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -30,8 +30,6 @@
     <string name="descending">Descendente</string>
     <string name="ok">OK</string>
     <string name="cancel">Cancelar</string>
-    <string name="set_as_wallpaper">Definir como fundo de ecrã</string>
-    <string name="set_as_wallpaper_failed">Falha ao definir como fundo de ecrã</string>
 
     <plurals name="folders_deleted">
         <item quantity="one">1 pasta eliminada</item>
@@ -56,6 +54,9 @@
     <string name="error_saving_file">Could not overwrite the source file</string>
 
     <!-- Set wallpaper -->
+    <string name="wallpaper">Wallpaper</string>
+    <string name="set_as_wallpaper">Definir como fundo de ecrã</string>
+    <string name="set_as_wallpaper_failed">Falha ao definir como fundo de ecrã</string>
     <string name="set_as_wallpaper_with">Set as wallpaper with:</string>
     <string name="no_wallpaper_setter_found">No app capable of it has been found</string>
     <string name="wallpaper_changed_successfully">Wallpaper changed successfully</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index b74a36ce6..beaec85d8 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -30,8 +30,6 @@
     <string name="descending">Descending</string>
     <string name="ok">OK</string>
     <string name="cancel">Cancel</string>
-    <string name="set_as_wallpaper">Set as Wallpaper</string>
-    <string name="set_as_wallpaper_failed">Setting as Wallpaper failed</string>
 
     <plurals name="folders_deleted">
         <item quantity="one">1 mapp borttagen</item>
@@ -56,6 +54,9 @@
     <string name="error_saving_file">Could not overwrite the source file</string>
 
     <!-- Set wallpaper -->
+    <string name="wallpaper">Wallpaper</string>
+    <string name="set_as_wallpaper">Set as Wallpaper</string>
+    <string name="set_as_wallpaper_failed">Setting as Wallpaper failed</string>
     <string name="set_as_wallpaper_with">Set as wallpaper with:</string>
     <string name="no_wallpaper_setter_found">No app capable of it has been found</string>
     <string name="wallpaper_changed_successfully">Wallpaper changed successfully</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2da2f6cf8..165306346 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -30,8 +30,6 @@
     <string name="descending">Descending</string>
     <string name="ok">OK</string>
     <string name="cancel">Cancel</string>
-    <string name="set_as_wallpaper">Set as Wallpaper</string>
-    <string name="set_as_wallpaper_failed">Setting as Wallpaper failed</string>
 
     <plurals name="folders_deleted">
         <item quantity="one">1 folder deleted</item>
@@ -56,6 +54,9 @@
     <string name="error_saving_file">Could not overwrite the source file</string>
 
     <!-- Set wallpaper -->
+    <string name="wallpaper">Wallpaper</string>
+    <string name="set_as_wallpaper">Set as Wallpaper</string>
+    <string name="set_as_wallpaper_failed">Setting as Wallpaper failed</string>
     <string name="set_as_wallpaper_with">Set as wallpaper with:</string>
     <string name="no_wallpaper_setter_found">No app capable of it has been found</string>
     <string name="wallpaper_changed_successfully">Wallpaper changed successfully</string>