diff --git a/apps/app/src/components/AddQuestionModal.tsx b/apps/app/src/components/AddQuestionModal.tsx
index 1546a453..f0a22205 100644
--- a/apps/app/src/components/AddQuestionModal.tsx
+++ b/apps/app/src/components/AddQuestionModal.tsx
@@ -122,10 +122,20 @@ export const AddQuestionModal = (props: ComponentProps<typeof BaseModal>) => {
 				</div>
 				<WysiwygEditor value={content} onChange={setContent} />
 				<BaseModal.Footer>
-					<Button type="submit" variant="brandingInverse" disabled={disabled}>
+					<Button
+						type="submit"
+						variant="brandingInverse"
+						disabled={disabled}
+						className="focus:shadow-primary dark:focus:shadow-white"
+					>
 						{modalData ? "Edytuj" : "Dodaj"} pytanie
 					</Button>
-					<Button type="button" variant="branding" onClick={closeModal}>
+					<Button
+						type="button"
+						variant="branding"
+						onClick={closeModal}
+						className="dark:focus:shadow-white"
+					>
 						Anuluj
 					</Button>
 				</BaseModal.Footer>
diff --git a/apps/app/src/components/CloseButton/CloseButton.tsx b/apps/app/src/components/CloseButton/CloseButton.tsx
index 7b50a6bf..2674c1ff 100644
--- a/apps/app/src/components/CloseButton/CloseButton.tsx
+++ b/apps/app/src/components/CloseButton/CloseButton.tsx
@@ -4,7 +4,7 @@ import { ButtonHTMLAttributes } from "react";
 export const CloseButton = ({ className, ...props }: ButtonHTMLAttributes<HTMLButtonElement>) => (
 	<button
 		className={twMerge(
-			"flex h-8 w-8 appearance-none items-center justify-center rounded-full text-4xl text-violet-200 transition-colors duration-100 hover:bg-primary hover:text-white focus:shadow-[0_0_10px] focus:shadow-primary focus:outline-none dark:hover:bg-violet-700",
+			"flex h-8 w-8 appearance-none items-center justify-center rounded-full text-4xl text-violet-200 transition-colors duration-100 hover:bg-primary hover:text-white focus:shadow-[0_0_10px] focus:shadow-primary focus:outline-none dark:hover:bg-violet-700 dark:focus:shadow-white",
 			className,
 		)}
 		{...props}