diff --git a/Oqtane.Client/Modules/Controls/Pager.razor b/Oqtane.Client/Modules/Controls/Pager.razor
index 668fa4ee..79642eaa 100644
--- a/Oqtane.Client/Modules/Controls/Pager.razor
+++ b/Oqtane.Client/Modules/Controls/Pager.razor
@@ -295,6 +295,10 @@
         if (!string.IsNullOrEmpty(SearchProperties))
         {
             AllItems = Items; // only used in search
+            if (!string.IsNullOrEmpty(_search))
+            {
+                Search();
+            }
         }
 
         if (!string.IsNullOrEmpty(PageSize))
diff --git a/Oqtane.Server/Repository/FileRepository.cs b/Oqtane.Server/Repository/FileRepository.cs
index e57ca3f1..829659e1 100644
--- a/Oqtane.Server/Repository/FileRepository.cs
+++ b/Oqtane.Server/Repository/FileRepository.cs
@@ -32,8 +32,9 @@ namespace Oqtane.Repository
 
         public IEnumerable<File> GetFiles(int folderId, bool tracking)
         {
-            var alias = _tenants.GetAlias();
-            IEnumerable<Permission> permissions = _permissions.GetPermissions(alias.SiteId, EntityNames.Folder, folderId).ToList();
+            var folder = _folderRepository.GetFolder(folderId, false);
+            IEnumerable<Permission> permissions = _permissions.GetPermissions(folder.SiteId, EntityNames.Folder, folderId).ToList();
+
             IEnumerable<File> files;
             if (tracking)
             {
@@ -46,6 +47,7 @@ namespace Oqtane.Repository
             foreach (File file in files)
             {
                 file.Folder.PermissionList = permissions.ToList();
+                var alias = _tenants.GetAlias();
                 file.Url = GetFileUrl(file, alias);
             }
             return files;