diff --git a/src/renderer/src/pages/settings/aparence/components/theme-card.tsx b/src/renderer/src/pages/settings/aparence/components/theme-card.tsx
index 1c30283f..4571705a 100644
--- a/src/renderer/src/pages/settings/aparence/components/theme-card.tsx
+++ b/src/renderer/src/pages/settings/aparence/components/theme-card.tsx
@@ -69,6 +69,7 @@ export const ThemeCard = ({ theme, onListUpdated }: ThemeCardProps) => {
         onThemeDeleted={onListUpdated}
         themeId={theme.id}
         themeName={theme.name}
+        isActive={theme.isActive}
       />
 
       <div
diff --git a/src/renderer/src/pages/settings/aparence/modals/delete-all-themes-modal.tsx b/src/renderer/src/pages/settings/aparence/modals/delete-all-themes-modal.tsx
index 47c58221..441f0c11 100644
--- a/src/renderer/src/pages/settings/aparence/modals/delete-all-themes-modal.tsx
+++ b/src/renderer/src/pages/settings/aparence/modals/delete-all-themes-modal.tsx
@@ -2,6 +2,7 @@ import { Button } from "@renderer/components/button/button";
 import { Modal } from "@renderer/components/modal/modal";
 import { useTranslation } from "react-i18next";
 import "./modals.scss";
+import { removeCustomCss } from "@renderer/helpers";
 
 interface DeleteAllThemesModalProps {
   visible: boolean;
@@ -17,6 +18,12 @@ export const DeleteAllThemesModal = ({
   const { t } = useTranslation("settings");
 
   const handleDeleteAllThemes = async () => {
+    const activeTheme = await window.electron.getActiveCustomTheme();
+
+    if (activeTheme) {
+      removeCustomCss();
+    }
+
     await window.electron.deleteAllCustomThemes();
     onClose();
     onThemesDeleted();
diff --git a/src/renderer/src/pages/settings/aparence/modals/delete-theme-modal.tsx b/src/renderer/src/pages/settings/aparence/modals/delete-theme-modal.tsx
index e0baa25e..ac5cfdbf 100644
--- a/src/renderer/src/pages/settings/aparence/modals/delete-theme-modal.tsx
+++ b/src/renderer/src/pages/settings/aparence/modals/delete-theme-modal.tsx
@@ -2,11 +2,13 @@ import { Button } from "@renderer/components/button/button";
 import { Modal } from "@renderer/components/modal/modal";
 import { useTranslation } from "react-i18next";
 import "./modals.scss";
+import { removeCustomCss } from "@renderer/helpers";
 
 interface DeleteThemeModalProps {
   visible: boolean;
   onClose: () => void;
   themeId: string;
+  isActive: boolean;
   onThemeDeleted: () => void;
   themeName: string;
 }
@@ -15,12 +17,17 @@ export const DeleteThemeModal = ({
   visible,
   onClose,
   themeId,
+  isActive,
   onThemeDeleted,
   themeName,
 }: DeleteThemeModalProps) => {
   const { t } = useTranslation("settings");
 
   const handleDeleteTheme = async () => {
+    if (isActive) {
+      removeCustomCss();
+    }
+
     await window.electron.deleteCustomTheme(themeId);
     onThemeDeleted();
   };