diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 52c3225e3..f7a425205 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -60,7 +60,7 @@
         <activity
             android:name=".ui.StartConversationActivity"
             android:label="@string/title_activity_start_conversation"
-            android:launchMode="singleTask">
+            android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.SENDTO" />
 
@@ -109,7 +109,7 @@
             android:name=".ui.SetPresenceActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/change_presence"
-            android:launchMode="singleTask"
+            android:launchMode="singleTop"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
             android:name=".ui.SettingsActivity"
@@ -126,10 +126,10 @@
         <activity
             android:name=".ui.ManageAccountActivity"
             android:label="@string/title_activity_manage_accounts"
-            android:launchMode="singleTask" />
+            android:launchMode="singleTop" />
         <activity
             android:name=".ui.EditAccountActivity"
-            android:launchMode="singleTask"
+            android:launchMode="singleTop"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
             android:name=".ui.ConferenceDetailsActivity"
@@ -149,7 +149,8 @@
             android:windowSoftInputMode="stateHidden" />
         <activity
             android:name=".ui.ShareWithActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />