diff --git a/packages/pl-fe/src/features/compose/editor/index.tsx b/packages/pl-fe/src/features/compose/editor/index.tsx
index cc4aa6677..8600f9c48 100644
--- a/packages/pl-fe/src/features/compose/editor/index.tsx
+++ b/packages/pl-fe/src/features/compose/editor/index.tsx
@@ -184,6 +184,7 @@ const ComposeEditor = React.forwardRef<LexicalEditor, IComposeEditor>(({
           contentEditable={
             <div onFocus={onFocus} onPaste={handlePaste} ref={onRef}>
               <ContentEditable
+                tabIndex={0}
                 className={clsx(
                   'relative z-10 text-[1rem] outline-none transition-[min-height] motion-reduce:transition-none',
                   editableClassName,
diff --git a/packages/pl-fe/src/features/ui/components/modals/compose-event-modal/index.tsx b/packages/pl-fe/src/features/ui/components/modals/compose-event-modal/index.tsx
index 48d8e5feb..305e21726 100644
--- a/packages/pl-fe/src/features/ui/components/modals/compose-event-modal/index.tsx
+++ b/packages/pl-fe/src/features/ui/components/modals/compose-event-modal/index.tsx
@@ -274,7 +274,7 @@ const ComposeEventModal: React.FC<BaseModalProps & ComposeEventModalProps> = ({
         labelText={<FormattedMessage id='compose_event.fields.description_label' defaultMessage='Event description' />}
       >
         <ComposeEditor
-          className='block w-full rounded-md border border-gray-400 bg-white px-3 py-2 text-base text-gray-900 ring-1 placeholder:text-gray-600 focus-within:border-primary-500 focus-within:ring-primary-500 sm:text-sm dark:border-gray-800 dark:bg-gray-900 dark:text-gray-100 dark:ring-gray-800 dark:placeholder:text-gray-600 dark:focus-within:border-primary-500 dark:focus-within:ring-primary-500'
+          className='block w-full rounded-md border border-gray-400 bg-white px-3 py-2 text-base text-gray-900 ring-1 placeholder:text-gray-600 focus-within:border-primary-500 focus-within:ring-primary-500 black:bg-black sm:text-sm dark:border-gray-800 dark:bg-gray-900 dark:text-gray-100 dark:ring-gray-800 dark:placeholder:text-gray-600 dark:focus-within:border-primary-500 dark:focus-within:ring-primary-500'
           placeholderClassName='pt-2'
           composeId={composeId}
           placeholder={intl.formatMessage(messages.eventDescriptionPlaceholder)}