diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb97d60..d32b485 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to
 - 🐛(dimail) improve handling of dimail errors on failed mailbox creation #377
 -  💬(frontend) fix group member removal text #382
 -  💬(frontend) fix add mail domain text #382
+- 🐛(frontend) fix keyboard navigation on language picker #379
 
 ## [1.0.2] - 2024-08-30
 
diff --git a/src/frontend/apps/desk/src/features/mail-domains/components/ModalAddMailDomain.tsx b/src/frontend/apps/desk/src/features/mail-domains/components/ModalAddMailDomain.tsx
index aed9f41..e327329 100644
--- a/src/frontend/apps/desk/src/features/mail-domains/components/ModalAddMailDomain.tsx
+++ b/src/frontend/apps/desk/src/features/mail-domains/components/ModalAddMailDomain.tsx
@@ -12,7 +12,7 @@ import { Controller, FormProvider, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { z } from 'zod';
 
-import { Box, StyledLink, Text, TextErrors } from '@/components';
+import { Box, Text, TextErrors } from '@/components';
 import { useCreateMailDomain } from '@/features/mail-domains';
 
 import { default as MailDomainsLogo } from '../assets/mail-domains-logo.svg';
@@ -77,16 +77,14 @@ export const ModalCreateMailDomain = () => {
     <Modal
       isOpen
       leftActions={
-        <StyledLink href="/mail-domains">
-          <Button color="secondary" tabIndex={-1}>
-            {t('Cancel')}
-          </Button>
-        </StyledLink>
+        <Button color="secondary" onClick={() => router.push('/mail-domains/')}>
+          {t('Cancel')}
+        </Button>
       }
       hideCloseButton
       closeOnClickOutside
       closeOnEsc
-      onClose={() => router.push('/mail-domains')}
+      onClose={() => router.push('/mail-domains/')}
       rightActions={
         <Button
           onClick={onSubmitCallback}