diff --git a/packages/next/src/views/CollectionFolders/buildView.tsx b/packages/next/src/views/CollectionFolders/buildView.tsx
index 8a110f20f..2d2384b71 100644
--- a/packages/next/src/views/CollectionFolders/buildView.tsx
+++ b/packages/next/src/views/CollectionFolders/buildView.tsx
@@ -178,7 +178,9 @@ export const buildCollectionFolderView = async (
                 permissions?.collections?.[config.folders.slug]?.create
                   ? config.folders.slug
                   : null,
-                permissions?.collections?.[collectionSlug]?.create ? collectionSlug : null,
+                resolvedFolderID && permissions?.collections?.[collectionSlug]?.create
+                  ? collectionSlug
+                  : null,
               ].filter(Boolean),
               baseFolderPath: `/collections/${collectionSlug}/${config.folders.slug}`,
               breadcrumbs,
diff --git a/packages/payload/src/folders/utils/getFolderData.ts b/packages/payload/src/folders/utils/getFolderData.ts
index 6acfcf49b..46bf72a38 100644
--- a/packages/payload/src/folders/utils/getFolderData.ts
+++ b/packages/payload/src/folders/utils/getFolderData.ts
@@ -79,30 +79,17 @@ export const getFolderData = async ({
       subfolders: sortDocs({ docs: result.subfolders, sort }),
     }
   } else {
-    // subfolders and documents are queried separately
     const subfoldersPromise = getOrphanedDocs({
       collectionSlug: payload.config.folders.slug,
       folderFieldName: payload.config.folders.fieldName,
       req,
       where: folderWhere,
     })
-    const documentsPromise = collectionSlug
-      ? getOrphanedDocs({
-          collectionSlug,
-          folderFieldName: payload.config.folders.fieldName,
-          req,
-          where: documentWhere,
-        })
-      : Promise.resolve([])
-    const [breadcrumbs, subfolders, documents] = await Promise.all([
-      breadcrumbsPromise,
-      subfoldersPromise,
-      documentsPromise,
-    ])
+    const [breadcrumbs, subfolders] = await Promise.all([breadcrumbsPromise, subfoldersPromise])
 
     return {
       breadcrumbs,
-      documents: sortDocs({ docs: documents, sort }),
+      documents: [],
       folderAssignedCollections: collectionSlug ? [collectionSlug] : undefined,
       subfolders: sortDocs({ docs: subfolders, sort }),
     }
diff --git a/packages/ui/src/views/BrowseByFolder/index.tsx b/packages/ui/src/views/BrowseByFolder/index.tsx
index f2688189e..81fe5bad8 100644
--- a/packages/ui/src/views/BrowseByFolder/index.tsx
+++ b/packages/ui/src/views/BrowseByFolder/index.tsx
@@ -264,7 +264,11 @@ function BrowseByFolderViewInContext(props: BrowseByFolderViewInContextProps) {
             TitleActions={[
               allowCreateCollectionSlugs.length && (
                 <ListCreateNewDocInFolderButton
-                  buttonLabel={t('general:createNew')}
+                  buttonLabel={
+                    allowCreateCollectionSlugs.length > 1
+                      ? t('general:createNew')
+                      : `${t('general:create')} ${getTranslation(folderCollectionConfig.labels?.singular, i18n).toLowerCase()}`
+                  }
                   collectionSlugs={allowCreateCollectionSlugs}
                   folderAssignedCollections={Array.isArray(folderType) ? folderType : []}
                   key="create-new-button"
diff --git a/packages/ui/src/views/CollectionFolder/index.tsx b/packages/ui/src/views/CollectionFolder/index.tsx
index f34bcebd3..63ef467fa 100644
--- a/packages/ui/src/views/CollectionFolder/index.tsx
+++ b/packages/ui/src/views/CollectionFolder/index.tsx
@@ -302,7 +302,11 @@ function CollectionFolderViewInContext(props: CollectionFolderViewInContextProps
             TitleActions={[
               allowCreateCollectionSlugs.length && (
                 <ListCreateNewDocInFolderButton
-                  buttonLabel={t('general:createNew')}
+                  buttonLabel={
+                    allowCreateCollectionSlugs.length > 1
+                      ? t('general:createNew')
+                      : `${t('general:create')} ${getTranslation(folderCollectionConfig.labels?.singular, i18n).toLowerCase()}`
+                  }
                   collectionSlugs={allowCreateCollectionSlugs}
                   folderAssignedCollections={
                     Array.isArray(folderType) ? folderType : [collectionSlug]
diff --git a/test/folders/e2e.spec.ts b/test/folders/e2e.spec.ts
index 43ea6037f..950cffeff 100644
--- a/test/folders/e2e.spec.ts
+++ b/test/folders/e2e.spec.ts
@@ -77,7 +77,7 @@ test.describe('Folders', () => {
 
     test('should create new folder from collection view', async () => {
       await page.goto(postURL.byFolder)
-      await createFolder({ folderName: 'New Folder From Collection', fromDropdown: true, page })
+      await createFolder({ folderName: 'New Folder From Collection', fromDropdown: false, page })
     })
 
     test('should create new folder from document view', async () => {
@@ -422,12 +422,10 @@ test.describe('Folders', () => {
 
     test('should create folder from By Folder view', async () => {
       await page.goto(postURL.byFolder)
-      const createDropdown = page.locator('.create-new-doc-in-folder__popup-button', {
-        hasText: 'Create',
+      const createButton = page.locator('.create-new-doc-in-folder__button', {
+        hasText: 'Create folder',
       })
-      await createDropdown.click()
-      const createFolderButton = page.locator('.popup-button-list__button', { hasText: 'Folder' })
-      await createFolderButton.click()
+      await createButton.click()
       await createFolderDoc({
         page,
         folderName: 'New Folder From Collection',
@@ -485,7 +483,7 @@ test.describe('Folders', () => {
       await createFolder({
         folderName,
         page,
-        fromDropdown: true,
+        fromDropdown: false,
         folderType: ['Omitted From Browse By', 'Posts'],
       })
 
diff --git a/test/helpers/folders/createFolder.ts b/test/helpers/folders/createFolder.ts
index f3c4785a1..331e01470 100644
--- a/test/helpers/folders/createFolder.ts
+++ b/test/helpers/folders/createFolder.ts
@@ -26,7 +26,7 @@ export async function createFolder({
     await createFolderButton.click()
   } else {
     const createFolderButton = page.locator(
-      '.create-new-doc-in-folder__button:has-text("Create New")',
+      '.list-header__title-and-actions .create-new-doc-in-folder__button:has-text("Create folder")',
     )
     await createFolderButton.click()
   }
diff --git a/test/helpers/folders/expectNoResultsAndCreateFolderButton.ts b/test/helpers/folders/expectNoResultsAndCreateFolderButton.ts
index d3d4d222d..636d091b0 100644
--- a/test/helpers/folders/expectNoResultsAndCreateFolderButton.ts
+++ b/test/helpers/folders/expectNoResultsAndCreateFolderButton.ts
@@ -7,6 +7,6 @@ type Args = {
 export async function expectNoResultsAndCreateFolderButton({ page }: Args): Promise<void> {
   const noResultsDiv = page.locator('div.no-results')
   await expect(noResultsDiv).toBeVisible()
-  const createFolderButton = page.locator('text=Create Folder')
+  const createFolderButton = noResultsDiv.locator('text=Create Folder')
   await expect(createFolderButton).toBeVisible()
 }