diff --git a/src/app/components/floating-column/settings/settings.component.html b/src/app/components/floating-column/settings/settings.component.html
index f4ef215a..869973b4 100644
--- a/src/app/components/floating-column/settings/settings.component.html
+++ b/src/app/components/floating-column/settings/settings.component.html
@@ -57,7 +57,7 @@
             <button (click)="onRemoveLang(l)">remove</button>
         </div>
         <div class="sub-section">
-            <input type="text" (input)="onSearchLang($event.target.value)" />
+            <input type="text" (input)="onSearchLang($event.target.value)" [(ngModel)]="searchLang" />
         </div>
         <div *ngFor="let l of searchedLangs">
             {{ l.iso639 }}
diff --git a/src/app/components/floating-column/settings/settings.component.ts b/src/app/components/floating-column/settings/settings.component.ts
index df88483c..d275e395 100644
--- a/src/app/components/floating-column/settings/settings.component.ts
+++ b/src/app/components/floating-column/settings/settings.component.ts
@@ -137,14 +137,23 @@ export class SettingsComponent implements OnInit {
 
     configuredLangs: ILanguage[] = [];
     searchedLangs: ILanguage[] = [];
+
+    searchLang: string;
+
     onSearchLang(input: string) {
         console.warn(input);
         this.searchedLangs = this.languageService.searchLanguage(input);
     }
 
     onAddLang(lang: ILanguage): boolean {
+        if(this.configuredLangs.find(x => x.iso639 === lang.iso639)) return false;
+
         this.configuredLangs.push(lang);
         this.languageService.addLanguage(lang);
+
+        this.searchLang = '';
+        this.searchedLangs.length = 0;
+
         return false;
     }
 
diff --git a/src/app/services/language.service.ts b/src/app/services/language.service.ts
index d64b3ac0..a7b818fc 100644
--- a/src/app/services/language.service.ts
+++ b/src/app/services/language.service.ts
@@ -10,7 +10,8 @@ export class LanguageService {
     }
 
     getConfiguredLanguages(): ILanguage[] {
-        return this.settingsService.getSettings().configuredLanguages;
+        const langs = this.settingsService.getSettings().configuredLanguages;
+        return langs;
     }
 
     addLanguage(lang: ILanguage){
diff --git a/src/app/states/settings.state.ts b/src/app/states/settings.state.ts
index 5bac7ca5..2c0cc76a 100644
--- a/src/app/states/settings.state.ts
+++ b/src/app/states/settings.state.ts
@@ -178,6 +178,7 @@ export class SettingsState {
         newSettings.autoFollowOnListEnabled = oldSettings.autoFollowOnListEnabled;
         newSettings.twitterBridgeEnabled = oldSettings.twitterBridgeEnabled;
         newSettings.twitterBridgeInstance = oldSettings.twitterBridgeInstance;
+        newSettings.configuredLanguages = oldSettings.configuredLanguages;
 
         return newSettings;
     }