diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index aaaeb9430..9e52ddd26 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -96,11 +96,6 @@
             android:name="android.max_aspect"
             android:value="10" />
 
-        <activity
-            android:name=".activities.SharedItemsActivity"
-            android:exported="false"
-            android:theme="@style/AppTheme"/>
-
         <activity
             android:name=".activities.MainActivity"
             android:label="@string/nc_app_name"
@@ -172,6 +167,10 @@
             android:theme="@style/TakePhotoTheme"
             android:windowSoftInputMode="stateHidden" />
 
+        <activity
+            android:name=".activities.SharedItemsActivity"
+            android:theme="@style/AppTheme"/>
+
         <receiver android:name=".receivers.PackageReplacedReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
index 8fa50f086..b60ed878a 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
@@ -187,6 +187,8 @@ class ConversationInfoController(args: Bundle) :
 
     private fun showSharedItems() {
         val intent = Intent(activity, SharedItemsActivity::class.java)
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
         intent.putExtra(BundleKeys.KEY_CONVERSATION_NAME, conversation?.displayName)
         intent.putExtra(BundleKeys.KEY_ROOM_TOKEN, conversationToken)
         intent.putExtra(BundleKeys.KEY_USER_ENTITY, conversationUser as Parcelable)