diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 888d2694..cef9943d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -98,6 +98,7 @@
 
         <activity
             android:name=".app.activities.SettingsActivity"
+            android:exported="true"
             android:label="@string/title_activity_termux_settings"
             android:theme="@style/Theme.AppCompat.Light.DarkActionBar" />
 
diff --git a/app/src/main/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml
index 61683ca5..dcd8d341 100644
--- a/app/src/main/res/xml/shortcuts.xml
+++ b/app/src/main/res/xml/shortcuts.xml
@@ -9,6 +9,7 @@
         need to be manually patched since dot (.) prefix does not work to automatically prefix the
         package name.
     -->
+
     <shortcut
         android:shortcutId="new_session"
         android:enabled="true"
@@ -18,7 +19,8 @@
         <intent
             android:action="android.intent.action.RUN"
             android:targetPackage="com.termux"
-            android:targetClass="com.termux.app.TermuxActivity"/>
+            android:targetClass="com.termux.app.TermuxActivity"
+            android:name="android.shortcut.conversation"/>
     </shortcut>
 
     <shortcut
@@ -30,8 +32,9 @@
         <intent
             android:action="android.intent.action.RUN"
             android:targetPackage="com.termux"
-            android:targetClass="com.termux.app.TermuxActivity">
-            <extra android:name="com.termux.app.failsafe_session" android:value="true" />
+            android:targetClass="com.termux.app.TermuxActivity"
+            android:name="android.shortcut.conversation">
+            <extra android:name="com.termux.app.failsafe_session" android:value="true"/>
         </intent>
     </shortcut>
 
@@ -42,9 +45,10 @@
         android:shortcutShortLabel="@string/action_open_settings"
         tools:targetApi="n_mr1">
         <intent
-            android:action="android.intent.action.RUN"
+            android:action="android.intent.action.VIEW"
             android:targetPackage="com.termux"
-            android:targetClass="com.termux.app.activities.SettingsActivity"/>
+            android:targetClass="com.termux.app.activities.SettingsActivity"
+            android:name="android.shortcut.conversation"/>
     </shortcut>
 
 </shortcuts>