diff --git a/app/src/debug/res/xml/shortcuts.xml b/app/src/debug/res/xml/shortcuts.xml
index beeda92e5b..b9acd279f8 100644
--- a/app/src/debug/res/xml/shortcuts.xml
+++ b/app/src/debug/res/xml/shortcuts.xml
@@ -6,7 +6,7 @@
         android:shortcutShortLabel="@string/shortcut_refresh">
         <intent
             android:action="eu.faircode.email.REFRESH"
-            android:targetClass="eu.faircode.email.ActivityMain"
+            android:targetClass="eu.faircode.email.debug.ActivityMain"
             android:targetPackage="eu.faircode.email.debug" />
         <categories android:name="android.shortcut.conversation" />
     </shortcut>
diff --git a/app/src/main/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml
index 6284381382..e79035e61f 100644
--- a/app/src/main/res/xml/shortcuts.xml
+++ b/app/src/main/res/xml/shortcuts.xml
@@ -23,7 +23,7 @@
         <categories android:name="android.shortcut.conversation" />
     </shortcut>
 
-    <share-target android:targetClass="eu.faircode.email.ActivityMain">
+    <share-target android:targetClass="eu.faircode.email.ActivityCompose">
         <category android:name="eu.faircode.email.TEXT_SHARE_TARGET" />
         <data android:mimeType="text/plain" />
     </share-target>