From 0ca3e7dcbdf745436d89d7b8e6c9f2c14df50869 Mon Sep 17 00:00:00 2001
From: Sean Edmunds <sean.edmunds@cottonteam.com>
Date: Mon, 2 Feb 2026 14:46:29 -0600
Subject: [PATCH] Bug fix

---
 .../ThemeModal/components/ThemeEditor.tsx      | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/pages/settings/components/Theming/Themes/ThemeModal/components/ThemeEditor.tsx b/src/pages/settings/components/Theming/Themes/ThemeModal/components/ThemeEditor.tsx
index 900b0de..716bc82 100644
--- a/src/pages/settings/components/Theming/Themes/ThemeModal/components/ThemeEditor.tsx
+++ b/src/pages/settings/components/Theming/Themes/ThemeModal/components/ThemeEditor.tsx
@@ -163,11 +163,16 @@ export function ThemeEditor({
 	};
 
 	useEffect(() => {
-		if (font) {
+		if (font && customFontEnabled) {
 			setDesignerTheme({
 				...designerTheme,
 				themeFont: font,
 			});
+		} else if (font && !customFontEnabled) {
+			setDesignerTheme({
+				...designerTheme,
+				themeFont: currentUser.defaultFont,
+			});
 		}
 	}, [font]);
 	useEffect(() => {
@@ -176,6 +181,7 @@ export function ThemeEditor({
 			setFont(designerTheme.themeFont);
 		}
 	}, [selectedTheme]);
+
 	return (
 		<>
 			<Group p={'2rem'} w={'100%'} justify='space-between'>
@@ -594,7 +600,11 @@ export function ThemeEditor({
 											size={32}
 											onClick={() => {
 												setCustomFontEnabled(!customFontEnabled);
-												setFont(customFontEnabled ? defaultTheme.themeFont : null);
+												setFont(
+													customFontEnabled
+														? currentUser.defaultFont
+														: defaultTheme.themeFont,
+												);
 											}}
 											style={{
 												borderRadius: '0px',
@@ -726,6 +736,7 @@ export function ThemeEditor({
 																			className={toolTipClasses.default}
 																		>
 																			<ActionIcon
+																				disabled={duplicate}
 																				variant='subtle'
 																				color='red'
 																				onClick={() => {
@@ -733,9 +744,6 @@ export function ThemeEditor({
 																						...designerTheme,
 																						[key]: defaultTheme[key as keyof Theme],
 																					});
-																					if (key.includes('Font')) {
-																						setFont(defaultTheme.themeFont);
-																					}
 																				}}
 																			>
 																				<FiX />