diff --git a/apps/meteor/client/components/ABAC/ABACUpsellModal/__snapshots__/ABACUpsellModal.spec.tsx.snap b/apps/meteor/client/components/ABAC/ABACUpsellModal/__snapshots__/ABACUpsellModal.spec.tsx.snap
index d3afc0672db5e..5fb1e343d0358 100644
--- a/apps/meteor/client/components/ABAC/ABACUpsellModal/__snapshots__/ABACUpsellModal.spec.tsx.snap
+++ b/apps/meteor/client/components/ABAC/ABACUpsellModal/__snapshots__/ABACUpsellModal.spec.tsx.snap
@@ -36,6 +36,7 @@ exports[`ABACUpsellModal should render the modal with correct content 1`] = `
             <button
               aria-label="Close"
               class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-trljwa rcx-css-lma364"
+              tabindex="-1"
               type="button"
             >
               <i
diff --git a/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.stories.tsx b/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.stories.tsx
index dfb5822ee9c41..e36828a4a48d9 100644
--- a/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.stories.tsx
+++ b/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.stories.tsx
@@ -8,6 +8,9 @@ export default {
 		layout: 'fullscreen',
 		actions: { argTypesRegex: '^on.*' },
 	},
+	args: {
+		onClose: () => undefined,
+	},
 } satisfies Meta<typeof CreateDiscussion>;
 
 export const Default: StoryFn<typeof CreateDiscussion> = (args) => <CreateDiscussion {...args} />;
diff --git a/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx b/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
index fe4438f9243a2..2ee2a44c1f3a6 100644
--- a/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
+++ b/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
@@ -1,30 +1,22 @@
 import type { IMessage, IRoom, IUser } from '@rocket.chat/core-typings';
 import {
-	Modal,
 	Field,
 	FieldGroup,
 	ToggleSwitch,
 	TextInput,
 	TextAreaInput,
-	Button,
 	Icon,
 	Box,
 	FieldHint,
 	FieldLabel,
 	FieldRow,
 	FieldError,
-	ModalHeader,
-	ModalTitle,
-	ModalClose,
-	ModalContent,
-	ModalFooter,
-	ModalFooterControllers,
 } from '@rocket.chat/fuselage';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import { GenericModal } from '@rocket.chat/ui-client';
 import { useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
 import { useMutation } from '@tanstack/react-query';
 import { useId, useState } from 'react';
-import type { ReactElement } from 'react';
 import { useForm, Controller } from 'react-hook-form';
 
 import { goToRoomById } from '../../lib/utils/goToRoomById';
@@ -50,14 +42,13 @@ type CreateDiscussionProps = {
 	nameSuggestion?: string;
 };
 
-// TODO: Replace `Modal` in favor of `GenericModal`
 const CreateDiscussion = ({
 	onClose,
 	defaultParentRoom,
 	parentMessageId,
 	nameSuggestion,
 	encryptedParentRoom = false,
-}: CreateDiscussionProps): ReactElement => {
+}: CreateDiscussionProps) => {
 	const t = useTranslation();
 
 	const [encryptedDisabled, setEncryptedDisabled] = useState(encryptedParentRoom);
@@ -119,168 +110,159 @@ const CreateDiscussion = ({
 	const membersId = useId();
 	const firstMessageId = useId();
 	const topicId = useId();
-	const modalId = useId();
 
 	return (
-		<Modal
-			aria-labelledby={`${modalId}-title`}
+		<GenericModal
+			variant='warning'
+			icon={null}
+			title={t('Discussion_title')}
+			onCancel={onClose}
 			wrapperFunction={(props) => <Box is='form' onSubmit={handleSubmit(handleCreate)} {...props} />}
+			confirmText={t('Create')}
+			cancelText={t('Cancel')}
+			confirmLoading={createDiscussionMutation.isPending}
 		>
-			<ModalHeader>
-				<ModalTitle id={`${modalId}-title`}>{t('Discussion_title')}</ModalTitle>
-				<ModalClose tabIndex={-1} onClick={onClose} />
-			</ModalHeader>
-			<ModalContent>
-				<Box mbe={24}>{t('Discussion_description')}</Box>
-				<FieldGroup>
-					<Field>
-						<FieldLabel htmlFor={parentRoomId} required>
-							{t('Discussion_target_channel')}
-						</FieldLabel>
-						<FieldRow>
-							{defaultParentRoom && (
-								<Controller
-									control={control}
-									name='parentRoom'
-									render={() => <DefaultParentRoomField defaultParentRoom={defaultParentRoom} />}
-								/>
-							)}
-							{!defaultParentRoom && (
-								<Controller
-									control={control}
-									name='parentRoom'
-									rules={{ required: t('Required_field', { field: t('Discussion_target_channel') }) }}
-									render={({ field: { name, onBlur, onChange, value } }) => (
-										<RoomAutoComplete
-											name={name}
-											onBlur={onBlur}
-											onChange={onChange}
-											value={value}
-											id={parentRoomId}
-											placeholder={t('Search_options')}
-											disabled={Boolean(defaultParentRoom)}
-											aria-invalid={Boolean(errors.parentRoom)}
-											aria-required='true'
-											aria-describedby={`${parentRoomId}-error`}
-											setSelectedRoom={onParentRoomChange}
-											renderRoomIcon={({ encrypted }) => (encrypted ? <Icon name='key' /> : null)}
-										/>
-									)}
-								/>
-							)}
-						</FieldRow>
-						{errors.parentRoom && (
-							<FieldError aria-live='assertive' id={`${parentRoomId}-error`}>
-								{errors.parentRoom.message}
-							</FieldError>
-						)}
-					</Field>
-					<Field>
-						<FieldLabel htmlFor={discussionNameId} required>
-							{t('Name')}
-						</FieldLabel>
-						<FieldRow>
+			<Box mbe={24}>{t('Discussion_description')}</Box>
+			<FieldGroup>
+				<Field>
+					<FieldLabel htmlFor={parentRoomId} required>
+						{t('Discussion_target_channel')}
+					</FieldLabel>
+					<FieldRow>
+						{defaultParentRoom && (
 							<Controller
-								name='name'
 								control={control}
-								rules={{ required: t('Required_field', { field: t('Name') }) }}
-								render={({ field }) => (
-									<TextInput
-										id={discussionNameId}
-										{...field}
-										aria-invalid={Boolean(errors.name)}
-										aria-required='true'
-										aria-describedby={`${discussionNameId}-error ${discussionNameId}-hint`}
-										addon={<Icon name='baloons' size='x20' />}
-									/>
-								)}
+								name='parentRoom'
+								render={() => <DefaultParentRoomField defaultParentRoom={defaultParentRoom} id={parentRoomId} />}
 							/>
-						</FieldRow>
-						{errors.name && (
-							<FieldError aria-live='assertive' id={`${discussionNameId}-error`}>
-								{errors.name.message}
-							</FieldError>
 						)}
-					</Field>
-					<Field>
-						<FieldLabel htmlFor={topicId}>{t('Topic')}</FieldLabel>
-						<FieldRow>
+						{!defaultParentRoom && (
 							<Controller
-								name='topic'
 								control={control}
-								render={({ field }) => <TextInput id={topicId} {...field} aria-describedby={`${topicId}-hint`} />}
-							/>
-						</FieldRow>
-						<FieldRow>
-							<FieldHint id={`${topicId}-hint`}>{t('Displayed_next_to_name')}</FieldHint>
-						</FieldRow>
-					</Field>
-					<Field>
-						<FieldLabel htmlFor={membersId}>{t('Members')}</FieldLabel>
-						<FieldRow>
-							<Controller
-								control={control}
-								name='usernames'
-								render={({ field: { name, onChange, value, onBlur } }) => (
-									<UserAutoCompleteMultiple
-										id={membersId}
+								name='parentRoom'
+								rules={{ required: t('Required_field', { field: t('Discussion_target_channel') }) }}
+								render={({ field: { name, onBlur, onChange, value } }) => (
+									<RoomAutoComplete
 										name={name}
+										onBlur={onBlur}
 										onChange={onChange}
 										value={value}
-										onBlur={onBlur}
-										placeholder={t('Add_people')}
-									/>
-								)}
-							/>
-						</FieldRow>
-					</Field>
-					<Field>
-						<FieldLabel htmlFor={firstMessageId}>{t('Discussion_first_message_title')}</FieldLabel>
-						<FieldRow>
-							<Controller
-								control={control}
-								name='firstMessage'
-								render={({ field }) => (
-									<TextAreaInput
-										id={firstMessageId}
-										{...field}
-										rows={5}
-										disabled={encrypted}
-										aria-describedby={`${firstMessageId}-hint ${firstMessageId}-encrypted-hint`}
+										id={parentRoomId}
+										placeholder={t('Search_options')}
+										disabled={Boolean(defaultParentRoom)}
+										aria-invalid={Boolean(errors.parentRoom)}
+										aria-required='true'
+										aria-describedby={`${parentRoomId}-error`}
+										setSelectedRoom={onParentRoomChange}
+										renderRoomIcon={({ encrypted }) => (encrypted ? <Icon name='key' /> : null)}
 									/>
 								)}
 							/>
-						</FieldRow>
-						{encrypted ? (
-							<FieldHint id={`${firstMessageId}-encrypted-hint`}>{t('Discussion_first_message_disabled_due_to_e2e')}</FieldHint>
-						) : (
-							<FieldHint id={`${firstMessageId}-hint`}>{t('First_message_hint')}</FieldHint>
 						)}
-					</Field>
-					<Field>
-						<FieldRow>
-							<FieldLabel htmlFor={encryptedId}>{t('Encrypted')}</FieldLabel>
-							<Controller
-								control={control}
-								name='encrypted'
-								render={({ field: { value, ...field } }) => (
-									<ToggleSwitch id={encryptedId} {...field} checked={value} disabled={encryptedDisabled} />
-								)}
-							/>
-						</FieldRow>
-						<FieldHint id={`${encryptedId}-hint`}>{getEncryptedHint({ isPrivate: true, encrypted })}</FieldHint>
-					</Field>
-				</FieldGroup>
-			</ModalContent>
-			<ModalFooter>
-				<ModalFooterControllers>
-					<Button onClick={onClose}>{t('Cancel')}</Button>
-					<Button type='submit' primary loading={createDiscussionMutation.isPending}>
-						{t('Create')}
-					</Button>
-				</ModalFooterControllers>
-			</ModalFooter>
-		</Modal>
+					</FieldRow>
+					{errors.parentRoom && (
+						<FieldError role='alert' id={`${parentRoomId}-error`}>
+							{errors.parentRoom.message}
+						</FieldError>
+					)}
+				</Field>
+				<Field>
+					<FieldLabel htmlFor={discussionNameId} required>
+						{t('Name')}
+					</FieldLabel>
+					<FieldRow>
+						<Controller
+							name='name'
+							control={control}
+							rules={{ required: t('Required_field', { field: t('Name') }) }}
+							render={({ field }) => (
+								<TextInput
+									id={discussionNameId}
+									{...field}
+									aria-invalid={Boolean(errors.name)}
+									aria-required='true'
+									aria-describedby={errors.name ? `${discussionNameId}-error` : undefined}
+									addon={<Icon name='baloons' size='x20' />}
+								/>
+							)}
+						/>
+					</FieldRow>
+					{errors.name && (
+						<FieldError role='alert' id={`${discussionNameId}-error`}>
+							{errors.name.message}
+						</FieldError>
+					)}
+				</Field>
+				<Field>
+					<FieldLabel htmlFor={topicId}>{t('Topic')}</FieldLabel>
+					<FieldRow>
+						<Controller
+							name='topic'
+							control={control}
+							render={({ field }) => <TextInput id={topicId} {...field} aria-describedby={`${topicId}-hint`} />}
+						/>
+					</FieldRow>
+					<FieldRow>
+						<FieldHint id={`${topicId}-hint`}>{t('Displayed_next_to_name')}</FieldHint>
+					</FieldRow>
+				</Field>
+				<Field>
+					<FieldLabel htmlFor={membersId}>{t('Members')}</FieldLabel>
+					<FieldRow>
+						<Controller
+							control={control}
+							name='usernames'
+							render={({ field: { name, onChange, value, onBlur } }) => (
+								<UserAutoCompleteMultiple
+									id={membersId}
+									name={name}
+									onChange={onChange}
+									value={value}
+									onBlur={onBlur}
+									placeholder={t('Add_people')}
+								/>
+							)}
+						/>
+					</FieldRow>
+				</Field>
+				<Field>
+					<FieldLabel htmlFor={firstMessageId}>{t('Discussion_first_message_title')}</FieldLabel>
+					<FieldRow>
+						<Controller
+							control={control}
+							name='firstMessage'
+							render={({ field }) => (
+								<TextAreaInput
+									id={firstMessageId}
+									{...field}
+									rows={5}
+									disabled={encrypted}
+									aria-describedby={encrypted ? `${firstMessageId}-encrypted-hint` : `${firstMessageId}-hint`}
+								/>
+							)}
+						/>
+					</FieldRow>
+					{encrypted ? (
+						<FieldHint id={`${firstMessageId}-encrypted-hint`}>{t('Discussion_first_message_disabled_due_to_e2e')}</FieldHint>
+					) : (
+						<FieldHint id={`${firstMessageId}-hint`}>{t('First_message_hint')}</FieldHint>
+					)}
+				</Field>
+				<Field>
+					<FieldRow>
+						<FieldLabel htmlFor={encryptedId}>{t('Encrypted')}</FieldLabel>
+						<Controller
+							control={control}
+							name='encrypted'
+							render={({ field: { value, ...field } }) => (
+								<ToggleSwitch id={encryptedId} {...field} checked={value} disabled={encryptedDisabled} />
+							)}
+						/>
+					</FieldRow>
+					<FieldHint id={`${encryptedId}-hint`}>{getEncryptedHint({ isPrivate: true, encrypted })}</FieldHint>
+				</Field>
+			</FieldGroup>
+		</GenericModal>
 	);
 };
 
diff --git a/apps/meteor/client/components/CreateDiscussion/DefaultParentRoomField.tsx b/apps/meteor/client/components/CreateDiscussion/DefaultParentRoomField.tsx
index fd012f7c5f8a3..b34940ab5bd4b 100644
--- a/apps/meteor/client/components/CreateDiscussion/DefaultParentRoomField.tsx
+++ b/apps/meteor/client/components/CreateDiscussion/DefaultParentRoomField.tsx
@@ -1,12 +1,16 @@
 import { Skeleton, TextInput, Callout } from '@rocket.chat/fuselage';
 import { useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
-import type { ReactElement } from 'react';
+import type { ComponentPropsWithoutRef } from 'react';
 import { useMemo } from 'react';
 
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
 
-const DefaultParentRoomField = ({ defaultParentRoom }: { defaultParentRoom: string }): ReactElement => {
+type DefaultParentRoomFieldProps = {
+	defaultParentRoom: string;
+} & Omit<ComponentPropsWithoutRef<typeof TextInput>, 'defaultValue' | 'disabled'>;
+
+const DefaultParentRoomField = ({ defaultParentRoom, ...props }: DefaultParentRoomFieldProps) => {
 	const t = useTranslation();
 
 	const query = useMemo(
@@ -34,6 +38,7 @@ const DefaultParentRoomField = ({ defaultParentRoom }: { defaultParentRoom: stri
 
 	return (
 		<TextInput
+			{...props}
 			defaultValue={roomCoordinator.getRoomName(data.room.t, {
 				_id: data.room._id,
 				fname: data.room.fname,
diff --git a/apps/meteor/client/components/CreateDiscussion/__snapshots__/CreateDiscussion.spec.tsx.snap b/apps/meteor/client/components/CreateDiscussion/__snapshots__/CreateDiscussion.spec.tsx.snap
index 65553ca945c97..acf289d347203 100644
--- a/apps/meteor/client/components/CreateDiscussion/__snapshots__/CreateDiscussion.spec.tsx.snap
+++ b/apps/meteor/client/components/CreateDiscussion/__snapshots__/CreateDiscussion.spec.tsx.snap
@@ -18,12 +18,16 @@ exports[`CreateDiscussion renders Default without crashing 1`] = `
           <div
             class="rcx-box rcx-box--full rcx-modal__header-inner"
           >
-            <h2
-              class="rcx-box rcx-box--full rcx-modal__title rcx-css-trljwa rcx-css-lma364"
-              id=":r6:-title"
+            <div
+              class="rcx-box rcx-box--full rcx-modal__header-text rcx-css-trljwa rcx-css-lma364"
             >
-              Discussion_title
-            </h2>
+              <h2
+                class="rcx-box rcx-box--full rcx-modal__title"
+                id=":r6:-title"
+              >
+                Discussion_title
+              </h2>
+            </div>
             <button
               aria-label="Close"
               class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-trljwa rcx-css-lma364"
@@ -43,7 +47,7 @@ exports[`CreateDiscussion renders Default without crashing 1`] = `
           class="rcx-box rcx-box--full rcx-modal__content rcx-css-1vw7itl"
         >
           <div
-            class="rcx-box rcx-box--full rcx-modal__content-wrapper rcx-css-56vo9k"
+            class="rcx-box rcx-box--full rcx-modal__content-wrapper rcx-css-r1bpeb"
           >
             <div
               class="rcx-box rcx-box--full rcx-css-heem01"
@@ -125,7 +129,6 @@ exports[`CreateDiscussion renders Default without crashing 1`] = `
                     class="rcx-box rcx-box--full rcx-label rcx-box rcx-box--full rcx-box--animated rcx-input-box__wrapper"
                   >
                     <input
-                      aria-describedby=":r2:-error :r2:-hint"
                       aria-invalid="false"
                       aria-required="true"
                       class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box"
@@ -239,7 +242,7 @@ exports[`CreateDiscussion renders Default without crashing 1`] = `
                   class="rcx-box rcx-box--full rcx-field__row"
                 >
                   <textarea
-                    aria-describedby=":r4:-hint :r4:-encrypted-hint"
+                    aria-describedby=":r4:-hint"
                     class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--type-textarea rcx-input-box"
                     cols="1"
                     id=":r4:"
@@ -300,7 +303,7 @@ exports[`CreateDiscussion renders Default without crashing 1`] = `
             role="group"
           >
             <button
-              class="rcx-box rcx-box--full rcx-button rcx-button-group__item"
+              class="rcx-box rcx-box--full rcx-button--secondary rcx-button rcx-button-group__item"
               type="button"
             >
               <span
diff --git a/apps/meteor/client/components/GenericUpsellModal/__snapshots__/GenericUpsellModal.spec.tsx.snap b/apps/meteor/client/components/GenericUpsellModal/__snapshots__/GenericUpsellModal.spec.tsx.snap
index b2fc2cc2475ca..c30192176c3b2 100644
--- a/apps/meteor/client/components/GenericUpsellModal/__snapshots__/GenericUpsellModal.spec.tsx.snap
+++ b/apps/meteor/client/components/GenericUpsellModal/__snapshots__/GenericUpsellModal.spec.tsx.snap
@@ -36,6 +36,7 @@ exports[`GenericUpsellModal renders Default without crashing 1`] = `
             <button
               aria-label="Close"
               class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-trljwa rcx-css-lma364"
+              tabindex="-1"
               type="button"
             >
               <i
@@ -146,6 +147,7 @@ exports[`GenericUpsellModal renders WithAnnotation without crashing 1`] = `
             <button
               aria-label="Close"
               class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-trljwa rcx-css-lma364"
+              tabindex="-1"
               type="button"
             >
               <i
@@ -261,6 +263,7 @@ exports[`GenericUpsellModal renders WithCustomButtons without crashing 1`] = `
             <button
               aria-label="Close"
               class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-trljwa rcx-css-lma364"
+              tabindex="-1"
               type="button"
             >
               <i
@@ -371,6 +374,7 @@ exports[`GenericUpsellModal renders WithCustomTagLine without crashing 1`] = `
             <button
               aria-label="Close"
               class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-trljwa rcx-css-lma364"
+              tabindex="-1"
               type="button"
             >
               <i
@@ -481,6 +485,7 @@ exports[`GenericUpsellModal renders WithFixedWidthAndHeight without crashing 1`]
             <button
               aria-label="Close"
               class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-trljwa rcx-css-lma364"
+              tabindex="-1"
               type="button"
             >
               <i
diff --git a/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/__snapshots__/TimestampPicker.spec.tsx.snap b/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/__snapshots__/TimestampPicker.spec.tsx.snap
index df50eddc966b7..2853d75da96ba 100644
--- a/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/__snapshots__/TimestampPicker.spec.tsx.snap
+++ b/apps/meteor/client/components/message/toolbar/items/actions/Timestamp/TimestampPicker/__snapshots__/TimestampPicker.spec.tsx.snap
@@ -77,6 +77,7 @@ exports[`Story Tests renders Default without crashing 1`] = `
             <button
               aria-label="Close"
               class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-trljwa rcx-css-lma364"
+              tabindex="-1"
               type="button"
             >
               <i
diff --git a/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/__snapshots__/DeleteRoomModal.spec.tsx.snap b/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/__snapshots__/DeleteRoomModal.spec.tsx.snap
index 18954bf849736..ebb41e2b66cfd 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/__snapshots__/DeleteRoomModal.spec.tsx.snap
+++ b/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/__snapshots__/DeleteRoomModal.spec.tsx.snap
@@ -31,6 +31,7 @@ exports[`DeleteRoomModal should render without crashing 1`] = `
             <button
               aria-label="Close"
               class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-trljwa rcx-css-lma364"
+              tabindex="-1"
               type="button"
             >
               <i
diff --git a/apps/meteor/client/views/e2e/EnterE2EPasswordModal/__snapshots__/EnterE2EPasswordModal.spec.tsx.snap b/apps/meteor/client/views/e2e/EnterE2EPasswordModal/__snapshots__/EnterE2EPasswordModal.spec.tsx.snap
index b711600150d89..2f03c6e9e5468 100644
--- a/apps/meteor/client/views/e2e/EnterE2EPasswordModal/__snapshots__/EnterE2EPasswordModal.spec.tsx.snap
+++ b/apps/meteor/client/views/e2e/EnterE2EPasswordModal/__snapshots__/EnterE2EPasswordModal.spec.tsx.snap
@@ -41,6 +41,7 @@ exports[`renders Default without crashing 1`] = `
             <button
               aria-label="Close"
               class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-trljwa rcx-css-lma364"
+              tabindex="-1"
               type="button"
             >
               <i
diff --git a/packages/ui-client/src/components/Modal/GenericModal/GenericModal.tsx b/packages/ui-client/src/components/Modal/GenericModal/GenericModal.tsx
index 68d63088383b4..22f378031c8f6 100644
--- a/packages/ui-client/src/components/Modal/GenericModal/GenericModal.tsx
+++ b/packages/ui-client/src/components/Modal/GenericModal/GenericModal.tsx
@@ -32,6 +32,7 @@ type GenericModalProps = RequiredModalProps & {
 	title?: string | ReactElement;
 	icon?: IconName | ReactElement | null;
 	confirmDisabled?: boolean;
+	confirmLoading?: boolean;
 	tagline?: ReactNode;
 	onCancel?: () => Promise<void> | void;
 	onClose?: () => Promise<void> | void;
@@ -89,6 +90,7 @@ const GenericModal = ({
 	onConfirm,
 	dontAskAgain,
 	confirmDisabled,
+	confirmLoading,
 	tagline,
 	wrapperFunction,
 	annotation,
@@ -139,7 +141,7 @@ const GenericModal = ({
 					{tagline && <ModalTagline color={taglineColor}>{tagline}</ModalTagline>}
 					<ModalTitle id={`${genericModalId}-title`}>{title ?? t('Are_you_sure')}</ModalTitle>
 				</ModalHeaderText>
-				{onClose && <ModalClose aria-label={t('Close')} onClick={handleCloseButtonClick} />}
+				{onClose && <ModalClose tabIndex={-1} aria-label={t('Close')} onClick={handleCloseButtonClick} />}
 			</ModalHeader>
 			<ModalContent fontScale='p2'>{children}</ModalContent>
 			<ModalFooter justifyContent={dontAskAgain || annotation ? 'space-between' : 'end'}>
@@ -152,12 +154,12 @@ const GenericModal = ({
 						</Button>
 					)}
 					{wrapperFunction && (
-						<Button {...getButtonProps(variant)} type='submit' disabled={confirmDisabled}>
+						<Button {...getButtonProps(variant)} type='submit' disabled={confirmDisabled} loading={confirmLoading}>
 							{confirmText ?? t('Ok')}
 						</Button>
 					)}
 					{!wrapperFunction && onConfirm && (
-						<Button {...getButtonProps(variant)} onClick={handleConfirm} disabled={confirmDisabled}>
+						<Button {...getButtonProps(variant)} onClick={handleConfirm} disabled={confirmDisabled} loading={confirmLoading}>
 							{confirmText ?? t('Ok')}
 						</Button>
 					)}