diff --git a/app/ui/src/debug/res/xml/shortcuts.xml b/app/ui/src/debug/res/xml/shortcuts.xml
new file mode 100644
index 000000000..142c687e3
--- /dev/null
+++ b/app/ui/src/debug/res/xml/shortcuts.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <shortcut
+        android:enabled="true"
+        android:icon="@mipmap/ic_launcher"
+        android:shortcutId="compose"
+        android:shortcutLongLabel="@string/search_bar_placeholder"
+        android:shortcutShortLabel="@string/search_bar_placeholder">
+        <intent
+            android:action="android.intent.action.ASSIST"
+            android:targetClass="de.mm20.launcher2.ui.assistant.AssistantActivity"
+            android:targetPackage="de.mm20.launcher2.debug" />
+    </shortcut>
+
+</shortcuts>
\ No newline at end of file
diff --git a/app/ui/src/main/AndroidManifest.xml b/app/ui/src/main/AndroidManifest.xml
index 5d5321732..843f3111b 100644
--- a/app/ui/src/main/AndroidManifest.xml
+++ b/app/ui/src/main/AndroidManifest.xml
@@ -24,6 +24,10 @@
                 <category android:name="android.intent.category.HOME" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+
+            <meta-data android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
+
         </activity>
 
         <activity
diff --git a/app/ui/src/main/res/xml-v25/debug_shortcuts.xml b/app/ui/src/main/res/xml-v25/debug_shortcuts.xml
deleted file mode 100644
index b9822dd89..000000000
--- a/app/ui/src/main/res/xml-v25/debug_shortcuts.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
-</shortcuts>
diff --git a/app/ui/src/main/res/xml/shortcuts.xml b/app/ui/src/main/res/xml/shortcuts.xml
new file mode 100644
index 000000000..345335073
--- /dev/null
+++ b/app/ui/src/main/res/xml/shortcuts.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts>
+</shortcuts>
\ No newline at end of file
diff --git a/app/ui/src/nightly/res/xml/shortcuts.xml b/app/ui/src/nightly/res/xml/shortcuts.xml
new file mode 100644
index 000000000..27c0c2ea9
--- /dev/null
+++ b/app/ui/src/nightly/res/xml/shortcuts.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <shortcut
+        android:enabled="true"
+        android:icon="@mipmap/ic_launcher"
+        android:shortcutId="compose"
+        android:shortcutLongLabel="@string/search_bar_placeholder"
+        android:shortcutShortLabel="@string/search_bar_placeholder">
+        <intent
+            android:action="android.intent.action.ASSIST"
+            android:targetClass="de.mm20.launcher2.ui.assistant.AssistantActivity"
+            android:targetPackage="de.mm20.launcher2.nightly" />
+    </shortcut>
+
+</shortcuts>
\ No newline at end of file
diff --git a/app/ui/src/release/res/xml/shortcuts.xml b/app/ui/src/release/res/xml/shortcuts.xml
new file mode 100644
index 000000000..272c0ad47
--- /dev/null
+++ b/app/ui/src/release/res/xml/shortcuts.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <shortcut
+        android:enabled="true"
+        android:icon="@mipmap/ic_launcher"
+        android:shortcutId="compose"
+        android:shortcutLongLabel="@string/search_bar_placeholder"
+        android:shortcutShortLabel="@string/search_bar_placeholder">
+        <intent
+            android:action="android.intent.action.ASSIST"
+            android:targetClass="de.mm20.launcher2.ui.assistant.AssistantActivity"
+            android:targetPackage="de.mm20.launcher2.release" />
+    </shortcut>
+
+</shortcuts>
\ No newline at end of file