diff --git a/public/locales/en/files.json b/public/locales/en/files.json
index 662cbbfb6..3e8938625 100644
--- a/public/locales/en/files.json
+++ b/public/locales/en/files.json
@@ -103,6 +103,11 @@
       "message": "This file has already been deleted (or replaced) in the current version. It may not be edited.",
       "close": "Close"
     },
+    "noSelectedFilesAlert": {
+      "title": "Select File(s)",
+      "message": "Please select one or more files.",
+      "close": "Close"
+    },
     "accessFileMenu": {
       "title": "Access File",
       "headers": {
@@ -122,11 +127,11 @@
       }
     },
     "downloadFiles": {
-        "title": "Download",
-        "options": {
-            "original": "Original Format",
-            "archival": "Archival Format (.tab)"
-        }
+      "title": "Download",
+      "options": {
+        "original": "Original Format",
+        "archival": "Archival Format (.tab)"
+      }
     }
   },
   "requestAccess": {
diff --git a/src/sections/dataset/dataset-files/files-table/FilesTableColumnsDefinition.tsx b/src/sections/dataset/dataset-files/files-table/FilesTableColumnsDefinition.tsx
index 53f985f51..bdf534f62 100644
--- a/src/sections/dataset/dataset-files/files-table/FilesTableColumnsDefinition.tsx
+++ b/src/sections/dataset/dataset-files/files-table/FilesTableColumnsDefinition.tsx
@@ -6,8 +6,12 @@ import { FileInfoHeader } from './file-info/FileInfoHeader'
 import { FileActionsHeader } from './file-actions/FileActionsHeader'
 import { FileActionsCell } from './file-actions/file-actions-cell/FileActionsCell'
 import { FilePaginationInfo } from '../../../../files/domain/models/FilePaginationInfo'
+import { FileSelection } from './row-selection/useFileSelection'
 
-export const createColumnsDefinition = (paginationInfo: FilePaginationInfo): ColumnDef<File>[] => [
+export const createColumnsDefinition = (
+  paginationInfo: FilePaginationInfo,
+  fileSelection: FileSelection
+): ColumnDef<File>[] => [
   {
     id: 'select',
     header: ({ table }) => (
@@ -38,7 +42,10 @@ export const createColumnsDefinition = (paginationInfo: FilePaginationInfo): Col
   },
   {
     header: ({ table }) => (
-      <FileActionsHeader files={table.getRowModel().rows.map((row) => row.original)} />
+      <FileActionsHeader
+        files={table.getRowModel().rows.map((row) => row.original)}
+        fileSelection={fileSelection}
+      />
     ),
     accessorKey: 'status',
     cell: (props) => <FileActionsCell file={props.row.original} />
diff --git a/src/sections/dataset/dataset-files/files-table/file-actions/FileActionsHeader.module.scss b/src/sections/dataset/dataset-files/files-table/file-actions/FileActionsHeader.module.scss
index 3b4481b8a..7154c087e 100644
--- a/src/sections/dataset/dataset-files/files-table/file-actions/FileActionsHeader.module.scss
+++ b/src/sections/dataset/dataset-files/files-table/file-actions/FileActionsHeader.module.scss
@@ -1,5 +1,5 @@
 .container {
-  text-align: right;
   display: flex;
   justify-content: end;
+  text-align: right;
 }
\ No newline at end of file
diff --git a/src/sections/dataset/dataset-files/files-table/file-actions/FileActionsHeader.tsx b/src/sections/dataset/dataset-files/files-table/file-actions/FileActionsHeader.tsx
index c762d8196..204ad474e 100644
--- a/src/sections/dataset/dataset-files/files-table/file-actions/FileActionsHeader.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-actions/FileActionsHeader.tsx
@@ -3,15 +3,17 @@ import { File } from '../../../../../files/domain/models/File'
 import styles from './FileActionsHeader.module.scss'
 import { useTranslation } from 'react-i18next'
 import { DownloadFilesButton } from './download-files/DownloadFilesButton'
+import { FileSelection } from '../row-selection/useFileSelection'
 interface FileActionsHeaderProps {
   files: File[]
+  fileSelection: FileSelection
 }
-export function FileActionsHeader({ files }: FileActionsHeaderProps) {
+export function FileActionsHeader({ files, fileSelection }: FileActionsHeaderProps) {
   const { t } = useTranslation('files')
   return (
     <div aria-label={t('actions.title')} className={styles.container}>
-      <EditFilesMenu files={files} />
-      <DownloadFilesButton files={files} />
+      <EditFilesMenu files={files} fileSelection={fileSelection} />
+      <DownloadFilesButton files={files} fileSelection={fileSelection} />
     </div>
   )
 }
diff --git a/src/sections/dataset/dataset-files/files-table/file-actions/download-files/DownloadFilesButton.tsx b/src/sections/dataset/dataset-files/files-table/file-actions/download-files/DownloadFilesButton.tsx
index e6595a578..4bf4bbbed 100644
--- a/src/sections/dataset/dataset-files/files-table/file-actions/download-files/DownloadFilesButton.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-actions/download-files/DownloadFilesButton.tsx
@@ -4,15 +4,21 @@ import { Button, DropdownButton, DropdownButtonItem } from '@iqss/dataverse-desi
 import { Download } from 'react-bootstrap-icons'
 import styles from './DownloadFilesButton.module.scss'
 import { useTranslation } from 'react-i18next'
+import { FileSelection } from '../../row-selection/useFileSelection'
+import { NoSelectedFilesModal } from '../no-selected-files-modal/NoSelectedFilesModal'
+import { useState } from 'react'
 
 interface DownloadFilesButtonProps {
   files: File[]
+  fileSelection: FileSelection
 }
 
 const MINIMUM_FILES_COUNT_TO_SHOW_DOWNLOAD_FILES_BUTTON = 1
-export function DownloadFilesButton({ files }: DownloadFilesButtonProps) {
+const SELECTED_FILES_EMPTY = 0
+export function DownloadFilesButton({ files, fileSelection }: DownloadFilesButtonProps) {
   const { t } = useTranslation('files')
   const { dataset } = useDataset()
+  const [showNoFilesSelectedModal, setShowNoFilesSelectedModal] = useState(false)
 
   if (
     files.length < MINIMUM_FILES_COUNT_TO_SHOW_DOWNLOAD_FILES_BUTTON ||
@@ -21,23 +27,49 @@ export function DownloadFilesButton({ files }: DownloadFilesButtonProps) {
     return <></>
   }
 
+  const onClick = () => {
+    if (Object.keys(fileSelection).length === SELECTED_FILES_EMPTY) {
+      setShowNoFilesSelectedModal(true)
+    }
+  }
+
   if (files.some((file) => file.isTabularData)) {
     return (
-      <DropdownButton
-        id="download-files"
-        icon={<Download className={styles.icon} />}
-        title={t('actions.downloadFiles.title')}
-        variant="secondary"
-        withSpacing>
-        <DropdownButtonItem>{t('actions.downloadFiles.options.original')}</DropdownButtonItem>
-        <DropdownButtonItem>{t('actions.downloadFiles.options.archival')}</DropdownButtonItem>
-      </DropdownButton>
+      <>
+        <DropdownButton
+          id="download-files"
+          icon={<Download className={styles.icon} />}
+          title={t('actions.downloadFiles.title')}
+          variant="secondary"
+          withSpacing>
+          <DropdownButtonItem onClick={onClick}>
+            {t('actions.downloadFiles.options.original')}
+          </DropdownButtonItem>
+          <DropdownButtonItem onClick={onClick}>
+            {t('actions.downloadFiles.options.archival')}
+          </DropdownButtonItem>
+        </DropdownButton>
+        <NoSelectedFilesModal
+          show={showNoFilesSelectedModal}
+          handleClose={() => setShowNoFilesSelectedModal(false)}
+        />
+      </>
     )
   }
 
   return (
-    <Button variant="secondary" icon={<Download className={styles.icon} />} withSpacing>
-      {t('actions.downloadFiles.title')}
-    </Button>
+    <>
+      <Button
+        variant="secondary"
+        icon={<Download className={styles.icon} />}
+        withSpacing
+        onClick={onClick}>
+        {t('actions.downloadFiles.title')}
+      </Button>
+      <NoSelectedFilesModal
+        show={showNoFilesSelectedModal}
+        handleClose={() => setShowNoFilesSelectedModal(false)}
+      />
+    </>
   )
 }
diff --git a/src/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu.tsx b/src/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu.tsx
index c255662df..052d5957e 100644
--- a/src/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu.tsx
@@ -6,12 +6,14 @@ import { EditFilesOptions } from './EditFilesOptions'
 import { File } from '../../../../../../files/domain/models/File'
 import { useTranslation } from 'react-i18next'
 import { useDataset } from '../../../../DatasetContext'
+import { FileSelection } from '../../row-selection/useFileSelection'
 
 interface EditFilesMenuProps {
   files: File[]
+  fileSelection: FileSelection
 }
 const MINIMUM_FILES_COUNT_TO_SHOW_EDIT_FILES_BUTTON = 1
-export function EditFilesMenu({ files }: EditFilesMenuProps) {
+export function EditFilesMenu({ files, fileSelection }: EditFilesMenuProps) {
   const { t } = useTranslation('files')
   const { user } = useSession()
   const { dataset } = useDataset()
@@ -30,7 +32,7 @@ export function EditFilesMenu({ files }: EditFilesMenuProps) {
       title={t('actions.editFilesMenu.title')}
       disabled={dataset.isLockedFromEdits || !dataset.hasValidTermsOfAccess}
       icon={<PencilFill className={styles.icon} />}>
-      <EditFilesOptions files={files} />
+      <EditFilesOptions files={files} fileSelection={fileSelection} />
     </DropdownButton>
   )
 }
diff --git a/src/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesOptions.tsx b/src/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesOptions.tsx
index 8bab46607..1377303f5 100644
--- a/src/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesOptions.tsx
+++ b/src/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesOptions.tsx
@@ -1,32 +1,62 @@
 import { DropdownButtonItem } from '@iqss/dataverse-design-system'
 import { File } from '../../../../../../files/domain/models/File'
 import { useTranslation } from 'react-i18next'
+import { useState } from 'react'
+import { FileSelection } from '../../row-selection/useFileSelection'
+import { NoSelectedFilesModal } from '../no-selected-files-modal/NoSelectedFilesModal'
 
 interface EditFileOptionsProps {
   files: File[]
+  fileSelection: FileSelection
 }
-export function EditFilesOptions({ files }: EditFileOptionsProps) {
+const SELECTED_FILES_EMPTY = 0
+export function EditFilesOptions({ files, fileSelection }: EditFileOptionsProps) {
   const { t } = useTranslation('files')
+  const [showNoFilesSelectedModal, setShowNoFilesSelectedModal] = useState(false)
   const settingsEmbargoAllowed = false // TODO - Ask Guillermo if this is included in the settings endpoint
   const provenanceEnabledByConfig = false // TODO - Ask Guillermo if this is included in the MVP and from which endpoint is coming from
 
+  const onClick = () => {
+    if (Object.keys(fileSelection).length === SELECTED_FILES_EMPTY) {
+      setShowNoFilesSelectedModal(true)
+    }
+  }
+
   return (
     <>
-      <DropdownButtonItem>{t('actions.editFilesMenu.options.metadata')}</DropdownButtonItem>
+      <DropdownButtonItem onClick={onClick}>
+        {t('actions.editFilesMenu.options.metadata')}
+      </DropdownButtonItem>
       {files.some((file) => file.access.restricted) && (
-        <DropdownButtonItem>{t('actions.editFilesMenu.options.unrestrict')}</DropdownButtonItem>
+        <DropdownButtonItem onClick={onClick}>
+          {t('actions.editFilesMenu.options.unrestrict')}
+        </DropdownButtonItem>
       )}
       {files.some((file) => !file.access.restricted) && (
-        <DropdownButtonItem>{t('actions.editFilesMenu.options.restrict')}</DropdownButtonItem>
+        <DropdownButtonItem onClick={onClick}>
+          {t('actions.editFilesMenu.options.restrict')}
+        </DropdownButtonItem>
       )}
-      <DropdownButtonItem>{t('actions.editFilesMenu.options.replace')}</DropdownButtonItem>
+      <DropdownButtonItem onClick={onClick}>
+        {t('actions.editFilesMenu.options.replace')}
+      </DropdownButtonItem>
       {settingsEmbargoAllowed && (
-        <DropdownButtonItem>{t('actions.editFilesMenu.options.embargo')}</DropdownButtonItem>
+        <DropdownButtonItem onClick={onClick}>
+          {t('actions.editFilesMenu.options.embargo')}
+        </DropdownButtonItem>
       )}
       {provenanceEnabledByConfig && (
-        <DropdownButtonItem>{t('actions.editFilesMenu.options.provenance')}</DropdownButtonItem>
+        <DropdownButtonItem onClick={onClick}>
+          {t('actions.editFilesMenu.options.provenance')}
+        </DropdownButtonItem>
       )}
-      <DropdownButtonItem>{t('actions.editFilesMenu.options.delete')}</DropdownButtonItem>
+      <DropdownButtonItem onClick={onClick}>
+        {t('actions.editFilesMenu.options.delete')}
+      </DropdownButtonItem>
+      <NoSelectedFilesModal
+        show={showNoFilesSelectedModal}
+        handleClose={() => setShowNoFilesSelectedModal(false)}
+      />
     </>
   )
 }
diff --git a/src/sections/dataset/dataset-files/files-table/file-actions/no-selected-files-modal/NoSelectedFilesModal.tsx b/src/sections/dataset/dataset-files/files-table/file-actions/no-selected-files-modal/NoSelectedFilesModal.tsx
new file mode 100644
index 000000000..d580b4b8c
--- /dev/null
+++ b/src/sections/dataset/dataset-files/files-table/file-actions/no-selected-files-modal/NoSelectedFilesModal.tsx
@@ -0,0 +1,30 @@
+import { useTranslation } from 'react-i18next'
+import { Button, Modal } from '@iqss/dataverse-design-system'
+import styles from '../file-actions-cell/file-action-buttons/file-options-menu/FileAlreadyDeletedModal.module.scss'
+import { ExclamationCircleFill } from 'react-bootstrap-icons'
+
+interface NoSelectedFilesModalProps {
+  show: boolean
+  handleClose: () => void
+}
+
+export function NoSelectedFilesModal({ show, handleClose }: NoSelectedFilesModalProps) {
+  const { t } = useTranslation('files')
+  return (
+    <Modal show={show} onHide={handleClose} size="lg">
+      <Modal.Header>
+        <Modal.Title>{t('actions.noSelectedFilesAlert.title')}</Modal.Title>
+      </Modal.Header>
+      <Modal.Body>
+        <p className={styles.paragraph}>
+          <ExclamationCircleFill /> {t('actions.noSelectedFilesAlert.message')}
+        </p>
+      </Modal.Body>
+      <Modal.Footer>
+        <Button variant="secondary" onClick={handleClose}>
+          {t('actions.noSelectedFilesAlert.close')}
+        </Button>
+      </Modal.Footer>
+    </Modal>
+  )
+}
diff --git a/src/sections/dataset/dataset-files/files-table/useFilesTable.tsx b/src/sections/dataset/dataset-files/files-table/useFilesTable.tsx
index a3e0d6d46..b403e9782 100644
--- a/src/sections/dataset/dataset-files/files-table/useFilesTable.tsx
+++ b/src/sections/dataset/dataset-files/files-table/useFilesTable.tsx
@@ -21,7 +21,7 @@ export function useFilesTable(files: File[], paginationInfo: FilePaginationInfo)
   )
   const table = useReactTable({
     data: files,
-    columns: createColumnsDefinition(paginationInfo),
+    columns: createColumnsDefinition(paginationInfo, fileSelection),
     state: {
       rowSelection: currentPageRowSelection
     },
diff --git a/src/stories/dataset/dataset-files/files-table/file-actions/download-files/DownloadFilesButton.stories.tsx b/src/stories/dataset/dataset-files/files-table/file-actions/download-files/DownloadFilesButton.stories.tsx
index 61e22d129..87836ad96 100644
--- a/src/stories/dataset/dataset-files/files-table/file-actions/download-files/DownloadFilesButton.stories.tsx
+++ b/src/stories/dataset/dataset-files/files-table/file-actions/download-files/DownloadFilesButton.stories.tsx
@@ -17,7 +17,12 @@ export default meta
 type Story = StoryObj<typeof EditFilesMenu>
 
 export const NonTabularFiles: Story = {
-  render: () => <DownloadFilesButton files={FileMother.createMany(2, { tabularData: undefined })} />
+  render: () => (
+    <DownloadFilesButton
+      files={FileMother.createMany(2, { tabularData: undefined })}
+      fileSelection={{}}
+    />
+  )
 }
 
 export const TabularFiles: Story = {
@@ -30,6 +35,7 @@ export const TabularFiles: Story = {
           unf: 'some-unf'
         }
       })}
+      fileSelection={{}}
     />
   )
 }
diff --git a/src/stories/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu.stories.tsx b/src/stories/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu.stories.tsx
index a50a9cff0..692bc1980 100644
--- a/src/stories/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu.stories.tsx
+++ b/src/stories/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu.stories.tsx
@@ -16,5 +16,5 @@ export default meta
 type Story = StoryObj<typeof EditFilesMenu>
 
 export const Default: Story = {
-  render: () => <EditFilesMenu files={FileMother.createMany(2)} />
+  render: () => <EditFilesMenu files={FileMother.createMany(2)} fileSelection={{}} />
 }
diff --git a/tests/component/sections/dataset/dataset-files/files-table/file-actions/FileActionsHeader.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/file-actions/FileActionsHeader.spec.tsx
index 3b8cbc009..1baf2e865 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/file-actions/FileActionsHeader.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/file-actions/FileActionsHeader.spec.tsx
@@ -20,7 +20,7 @@ describe('FileActionsHeader', () => {
       <DatasetProvider
         repository={datasetRepository}
         searchParams={{ persistentId: 'some-persistent-id', version: 'some-version' }}>
-        <FileActionsHeader files={files} />
+        <FileActionsHeader files={files} fileSelection={{}} />
       </DatasetProvider>
     )
 
diff --git a/tests/component/sections/dataset/dataset-files/files-table/file-actions/download-files/DownloadFilesButton.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/file-actions/download-files/DownloadFilesButton.spec.tsx
index c3d8ab9fe..e380f0786 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/file-actions/download-files/DownloadFilesButton.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/file-actions/download-files/DownloadFilesButton.spec.tsx
@@ -30,7 +30,10 @@ describe('DownloadFilesButton', () => {
     })
     const files = FileMother.createMany(2)
     cy.mountAuthenticated(
-      withDataset(<DownloadFilesButton files={files} />, datasetWithDownloadFilesPermission)
+      withDataset(
+        <DownloadFilesButton files={files} fileSelection={{}} />,
+        datasetWithDownloadFilesPermission
+      )
     )
 
     cy.findByRole('button', { name: 'Download' }).should('exist')
@@ -42,7 +45,10 @@ describe('DownloadFilesButton', () => {
     })
     const files = FileMother.createMany(1)
     cy.mountAuthenticated(
-      withDataset(<DownloadFilesButton files={files} />, datasetWithDownloadFilesPermission)
+      withDataset(
+        <DownloadFilesButton files={files} fileSelection={{}} />,
+        datasetWithDownloadFilesPermission
+      )
     )
 
     cy.findByRole('button', { name: 'Download' }).should('not.exist')
@@ -54,7 +60,10 @@ describe('DownloadFilesButton', () => {
     })
     const files = FileMother.createMany(2)
     cy.mountAuthenticated(
-      withDataset(<DownloadFilesButton files={files} />, datasetWithoutDownloadFilesPermission)
+      withDataset(
+        <DownloadFilesButton files={files} fileSelection={{}} />,
+        datasetWithoutDownloadFilesPermission
+      )
     )
 
     cy.findByRole('button', { name: 'Download' }).should('not.exist')
@@ -72,7 +81,10 @@ describe('DownloadFilesButton', () => {
       }
     })
     cy.mountAuthenticated(
-      withDataset(<DownloadFilesButton files={files} />, datasetWithDownloadFilesPermission)
+      withDataset(
+        <DownloadFilesButton files={files} fileSelection={{}} />,
+        datasetWithDownloadFilesPermission
+      )
     )
 
     cy.findByRole('button', { name: 'Download' }).click()
@@ -86,11 +98,49 @@ describe('DownloadFilesButton', () => {
     })
     const files = FileMother.createMany(2, { tabularData: undefined })
     cy.mountAuthenticated(
-      withDataset(<DownloadFilesButton files={files} />, datasetWithDownloadFilesPermission)
+      withDataset(
+        <DownloadFilesButton files={files} fileSelection={{}} />,
+        datasetWithDownloadFilesPermission
+      )
     )
 
     cy.findByRole('button', { name: 'Download' }).click()
     cy.findByRole('button', { name: 'Original Format' }).should('not.exist')
     cy.findByRole('button', { name: 'Archival Format (.tab)' }).should('not.exist')
   })
+
+  it('shows the No Selected Files modal if no files are selected', () => {
+    const datasetWithDownloadFilesPermission = DatasetMother.create({
+      permissions: DatasetPermissionsMother.createWithFilesDownloadAllowed()
+    })
+    const files = FileMother.createMany(2)
+    cy.mountAuthenticated(
+      withDataset(
+        <DownloadFilesButton files={files} fileSelection={{}} />,
+        datasetWithDownloadFilesPermission
+      )
+    )
+
+    cy.findByRole('button', { name: 'Download' }).click()
+    cy.findByText('Select File(s)').should('exist')
+  })
+
+  it('does not show the No Selected Files modal if files are selected', () => {
+    const datasetWithDownloadFilesPermission = DatasetMother.create({
+      permissions: DatasetPermissionsMother.createWithFilesDownloadAllowed()
+    })
+    const files = FileMother.createMany(2)
+    cy.mountAuthenticated(
+      withDataset(
+        <DownloadFilesButton
+          files={files}
+          fileSelection={{ 'some-file-id': FileMother.create() }}
+        />,
+        datasetWithDownloadFilesPermission
+      )
+    )
+
+    cy.findByRole('button', { name: 'Download' }).click()
+    cy.findByText('Select File(s)').should('not.exist')
+  })
 })
diff --git a/tests/component/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu.spec.tsx
index eaa400bd2..0cc9ac5b9 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesMenu.spec.tsx
@@ -32,27 +32,31 @@ describe('EditFilesMenu', () => {
 
   it('renders the Edit Files menu', () => {
     cy.mountAuthenticated(
-      withDataset(<EditFilesMenu files={files} />, datasetWithUpdatePermissions)
+      withDataset(<EditFilesMenu files={files} fileSelection={{}} />, datasetWithUpdatePermissions)
     )
 
     cy.findByRole('button', { name: 'Edit Files' }).should('exist')
   })
 
   it('does not render the Edit Files menu when the user is not authenticated', () => {
-    cy.customMount(withDataset(<EditFilesMenu files={files} />, datasetWithUpdatePermissions))
+    cy.customMount(
+      withDataset(<EditFilesMenu files={files} fileSelection={{}} />, datasetWithUpdatePermissions)
+    )
 
     cy.findByRole('button', { name: 'Edit Files' }).should('not.exist')
   })
 
   it('does not render the Edit Files menu when there are no files in the dataset', () => {
-    cy.mountAuthenticated(withDataset(<EditFilesMenu files={[]} />, datasetWithUpdatePermissions))
+    cy.mountAuthenticated(
+      withDataset(<EditFilesMenu files={[]} fileSelection={{}} />, datasetWithUpdatePermissions)
+    )
 
     cy.findByRole('button', { name: 'Edit Files' }).should('not.exist')
   })
 
   it('renders the Edit Files options', () => {
     cy.mountAuthenticated(
-      withDataset(<EditFilesMenu files={files} />, datasetWithUpdatePermissions)
+      withDataset(<EditFilesMenu files={files} fileSelection={{}} />, datasetWithUpdatePermissions)
     )
 
     cy.findByRole('button', { name: 'Edit Files' }).click()
@@ -65,7 +69,10 @@ describe('EditFilesMenu', () => {
     })
 
     cy.mountAuthenticated(
-      withDataset(<EditFilesMenu files={files} />, datasetWithNoUpdatePermissions)
+      withDataset(
+        <EditFilesMenu files={files} fileSelection={{}} />,
+        datasetWithNoUpdatePermissions
+      )
     )
 
     cy.findByRole('button', { name: 'Edit Files' }).should('not.exist')
@@ -78,7 +85,7 @@ describe('EditFilesMenu', () => {
     })
 
     cy.mountAuthenticated(
-      withDataset(<EditFilesMenu files={files} />, datasetWithUpdatePermissions)
+      withDataset(<EditFilesMenu files={files} fileSelection={{}} />, datasetWithUpdatePermissions)
     )
 
     cy.findByRole('button', { name: 'Edit Files' }).should('be.disabled')
@@ -91,7 +98,7 @@ describe('EditFilesMenu', () => {
     })
 
     cy.mountAuthenticated(
-      withDataset(<EditFilesMenu files={files} />, datasetWithUpdatePermissions)
+      withDataset(<EditFilesMenu files={files} fileSelection={{}} />, datasetWithUpdatePermissions)
     )
 
     cy.findByRole('button', { name: 'Edit Files' }).should('be.disabled')
diff --git a/tests/component/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesOptions.spec.tsx b/tests/component/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesOptions.spec.tsx
index 8006fe0aa..2571bfcf9 100644
--- a/tests/component/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesOptions.spec.tsx
+++ b/tests/component/sections/dataset/dataset-files/files-table/file-actions/edit-files-menu/EditFilesOptions.spec.tsx
@@ -4,7 +4,7 @@ import { FileMother } from '../../../../../../files/domain/models/FileMother'
 const files = FileMother.createMany(2)
 describe('EditFilesOptions', () => {
   it('renders the EditFilesOptions', () => {
-    cy.customMount(<EditFilesOptions files={files} />)
+    cy.customMount(<EditFilesOptions files={files} fileSelection={{}} />)
 
     cy.findByRole('button', { name: 'Metadata' }).should('exist')
     cy.findByRole('button', { name: 'Replace' }).should('exist')
@@ -15,27 +15,66 @@ describe('EditFilesOptions', () => {
 
   it('renders the restrict option if some file is unrestricted', () => {
     const fileUnrestricted = FileMother.createDefault()
-    cy.customMount(<EditFilesOptions files={[fileUnrestricted]} />)
+    cy.customMount(<EditFilesOptions files={[fileUnrestricted]} fileSelection={{}} />)
 
-    cy.findByRole('button', { name: 'Restrict' }).should('exist')
+    cy.findByRole('button', { name: 'Restrict' }).should('exist').click()
+    cy.findByText('Select File(s)').should('exist')
+    cy.findByText('Close').click()
   })
 
   it('renders the unrestrict option if some file is restricted', () => {
     const fileRestricted = FileMother.createWithRestrictedAccess()
-    cy.customMount(<EditFilesOptions files={[fileRestricted]} />)
+    cy.customMount(<EditFilesOptions files={[fileRestricted]} fileSelection={{}} />)
 
-    cy.findByRole('button', { name: 'Unrestrict' }).should('exist')
+    cy.findByRole('button', { name: 'Unrestrict' }).should('exist').click()
+    cy.findByText('Select File(s)').should('exist')
+    cy.findByText('Close').click()
   })
 
   it.skip('renders the embargo option if the embargo is allowed by settings', () => {
-    cy.customMount(<EditFilesOptions files={files} />)
+    cy.customMount(<EditFilesOptions files={files} fileSelection={{}} />)
 
-    cy.findByRole('button', { name: 'Embargo' }).should('exist')
+    cy.findByRole('button', { name: 'Embargo' }).should('exist').click()
+    cy.findByText('Select File(s)').should('exist')
+    cy.findByText('Close').click()
   })
 
   it.skip('renders provenance option if provenance is enabled in config', () => {
-    cy.customMount(<EditFilesOptions files={files} />)
+    cy.customMount(<EditFilesOptions files={files} fileSelection={{}} />)
 
-    cy.findByRole('button', { name: 'Provenance' }).should('exist')
+    cy.findByRole('button', { name: 'Provenance' }).should('exist').click()
+    cy.findByText('Select File(s)').should('exist')
+    cy.findByText('Close').click()
+  })
+
+  it('shows the No Selected Files message when no files are selected and one option is clicked', () => {
+    cy.customMount(<EditFilesOptions files={files} fileSelection={{}} />)
+
+    cy.findByRole('button', { name: 'Metadata' }).click()
+    cy.findByText('Select File(s)').should('exist')
+    cy.findByText('Close').click()
+
+    cy.findByRole('button', { name: 'Replace' }).click()
+    cy.findByText('Select File(s)').should('exist')
+    cy.findByText('Close').click()
+
+    cy.findByRole('button', { name: 'Delete' }).click()
+    cy.findByText('Select File(s)').should('exist')
+    cy.findByText('Close').click()
+  })
+
+  it('does not show the No Selected Files message when files are selected and one option is clicked', () => {
+    cy.customMount(
+      <EditFilesOptions files={files} fileSelection={{ 'some-file-id': FileMother.create() }} />
+    )
+
+    cy.findByRole('button', { name: 'Metadata' }).click()
+    cy.findByText('Select File(s)').should('not.exist')
+
+    cy.findByRole('button', { name: 'Replace' }).click()
+    cy.findByText('Select File(s)').should('not.exist')
+
+    cy.findByRole('button', { name: 'Delete' }).click()
+    cy.findByText('Select File(s)').should('not.exist')
   })
 })