diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/OCShareToOCFileConverter.kt b/app/src/main/java/com/owncloud/android/ui/adapter/OCShareToOCFileConverter.kt
index 45c5216e93f9..fd17de1605f6 100644
--- a/app/src/main/java/com/owncloud/android/ui/adapter/OCShareToOCFileConverter.kt
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/OCShareToOCFileConverter.kt
@@ -84,7 +84,7 @@ object OCShareToOCFileConverter {
         }
 
         storageManager?.saveShares(newShares, accountName)
-        cachedFiles + newFiles
+        (cachedFiles + newFiles).distinctBy { it.remotePath }
     }
 
     private fun buildOcFile(path: String, shares: List<OCShare>): OCFile {
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt
index ef938616dd6c..c9da435e7e61 100644
--- a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt
+++ b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt
@@ -176,21 +176,26 @@ class OCFileListSearchTask(
             return@withContext FileStorageUtils.sortOcFolderDescDateModifiedWithoutFavoritesFirst(newList)
         }
 
-        if (searchType != SearchType.SHARED_FILTER) {
-            val foldersBeforeFiles = preferences.isSortFoldersBeforeFiles()
-            val favoritesFirst = preferences.isSortFavoritesFirst()
+        val foldersBeforeFiles = preferences.isSortFoldersBeforeFiles()
+        val favoritesFirst = preferences.isSortFavoritesFirst()
 
-            val sortOrder =
-                if (searchType == SearchType.FAVORITE_SEARCH) {
-                    preferences.getSortOrderByType(FileSortOrder.Type.favoritesListView)
-                } else {
-                    preferences.getSortOrderByFolder(folder)
-                }
+        val sortOrder = when (searchType) {
+            SearchType.FAVORITE_SEARCH -> {
+                preferences.getSortOrderByType(FileSortOrder.Type.favoritesListView)
+            }
 
-            setNewSortOrder(sortOrder)
-            newList = sortOrder.sortCloudFiles(newList, foldersBeforeFiles, favoritesFirst)
+            SearchType.SHARED_FILTER -> {
+                FileSortOrder.SORT_A_TO_Z
+            }
+
+            else -> {
+                preferences.getSortOrderByFolder(folder)
+            }
         }
 
+        setNewSortOrder(sortOrder)
+        newList = sortOrder.sortCloudFiles(newList, foldersBeforeFiles, favoritesFirst)
+
         return@withContext newList
     }