diff --git a/frontend/src/settings/General.tsx b/frontend/src/settings/General.tsx
index eb5ac90..bf917d9 100644
--- a/frontend/src/settings/General.tsx
+++ b/frontend/src/settings/General.tsx
@@ -84,6 +84,11 @@ const General: React.FC = () => {
     fetchPrompts();
   }, []);
 
+  React.useEffect(() => {
+    localStorage.setItem('docsgpt-locale', selectedLanguage?.value as string);
+    changeLanguage(selectedLanguage?.value);
+  }, [selectedLanguage, changeLanguage]);
+
   return (
     <div className="mt-[59px]">
       <div className="mb-5">
@@ -107,12 +112,13 @@ const General: React.FC = () => {
           {t('settings.general.selectLanguage')}
         </p>
         <Dropdown
-          options={languageOptions}
+          options={languageOptions.filter(
+            (languageOption) =>
+              languageOption.value !== selectedLanguage?.value,
+          )}
           selectedValue={selectedLanguage ?? languageOptions[0]}
           onSelect={(selectedOption: { label: string; value: string }) => {
             setSelectedLanguage(selectedOption);
-            changeLanguage(selectedOption.value);
-            localStorage.setItem('docsgpt-locale', selectedOption.value);
           }}
           size="w-56"
           rounded="3xl"
diff --git a/frontend/src/settings/index.tsx b/frontend/src/settings/index.tsx
index 9c0714c..3969fce 100644
--- a/frontend/src/settings/index.tsx
+++ b/frontend/src/settings/index.tsx
@@ -12,6 +12,7 @@ import { Doc } from '../preferences/preferenceApi';
 import ArrowLeft from '../assets/arrow-left.svg';
 import ArrowRight from '../assets/arrow-right.svg';
 import { useTranslation } from 'react-i18next';
+import i18n from '../locale/i18n';
 
 const apiHost = import.meta.env.VITE_API_HOST || 'https://docsapi.arc53.com';
 
@@ -23,7 +24,7 @@ const Settings: React.FC = () => {
     t('settings.documents.label'),
     t('settings.apiKeys.label'),
   ];
-  const [activeTab, setActiveTab] = React.useState('General');
+  const [activeTab, setActiveTab] = React.useState(t('settings.general.label'));
   const [widgetScreenshot, setWidgetScreenshot] = React.useState<File | null>(
     null,
   );
@@ -48,6 +49,11 @@ const Settings: React.FC = () => {
       })
       .catch((error) => console.error(error));
   };
+
+  // persist active tab as the translated version of 'general' per language change
+  React.useEffect(() => {
+    setActiveTab(t('settings.general.label'));
+  }, [i18n.language]);
   return (
     <div className="wa p-4 pt-20 md:p-12">
       <p className="text-2xl font-bold text-eerie-black dark:text-bright-gray">