diff --git a/ui/js/actions/app.js b/ui/js/actions/app.js
index 62eaeb5e1..de0f158c9 100644
--- a/ui/js/actions/app.js
+++ b/ui/js/actions/app.js
@@ -253,6 +253,6 @@ export function doChangeLanguage(newLanguage) {
   app.i18n.setLocale(newLanguage);
   return {
     type: types.CHANGE_LANGUAGE,
-    data: { newLanguage: newLanguage }
-  }
+    data: { newLanguage: newLanguage },
+  };
 }
diff --git a/ui/js/constants/action_types.js b/ui/js/constants/action_types.js
index 32f7b3ef3..b85cf8c8f 100644
--- a/ui/js/constants/action_types.js
+++ b/ui/js/constants/action_types.js
@@ -99,4 +99,4 @@ export const CLAIM_REWARD_FAILURE = "CLAIM_REWARD_FAILURE";
 export const CLAIM_REWARD_CLEAR_ERROR = "CLAIM_REWARD_CLEAR_ERROR";
 
 //Language
-export const LANGUAGE_CHANGED = "LANGUAGE_CHANGED";
\ No newline at end of file
+export const LANGUAGE_CHANGED = "LANGUAGE_CHANGED";
diff --git a/ui/js/page/settings/index.js b/ui/js/page/settings/index.js
index bd41c6844..de4b57f84 100644
--- a/ui/js/page/settings/index.js
+++ b/ui/js/page/settings/index.js
@@ -1,8 +1,17 @@
 import React from "react";
 import { connect } from "react-redux";
-import { doClearCache } from "actions/app";
-import { doSetDaemonSetting, doSetClientSetting, doChangeLanguage } from "actions/settings";
-import { selectDaemonSettings, selectShowNsfw, selectCurrentLanguage } from "selectors/settings";
+import { doClearCache, doChangeLanguage } from "actions/app";
+import {
+  doSetDaemonSetting,
+  doSetClientSetting,
+} from "actions/settings";
+import {
+  selectDaemonSettings,
+  selectShowNsfw,
+} from "selectors/settings";
+import {
+  selectCurrentLanguage,
+} from "selectors/app"
 import SettingsPage from "./view";
 
 const select = state => ({
@@ -15,7 +24,7 @@ const perform = dispatch => ({
   setDaemonSetting: (key, value) => dispatch(doSetDaemonSetting(key, value)),
   clearCache: () => dispatch(doClearCache()),
   setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
-  changeLanguage: (newLanguage) => dispatch(doChangeLanguage),
+  changeLanguage: newLanguage => dispatch(doChangeLanguage),
 });
 
 export default connect(select, perform)(SettingsPage);
diff --git a/ui/js/page/settings/view.jsx b/ui/js/page/settings/view.jsx
index dc4d55d60..d735851dc 100644
--- a/ui/js/page/settings/view.jsx
+++ b/ui/js/page/settings/view.jsx
@@ -86,7 +86,7 @@ class SettingsPage extends React.PureComponent {
   }
 
   onLanguageChange(e) {
-    this.props.changeLanguage(e.target.value)
+    this.props.changeLanguage(e.target.value);
   }
 
   // onLanguageChange(language) {
@@ -166,27 +166,27 @@ class SettingsPage extends React.PureComponent {
                 name="language"
                 label={__("English")}
                 onChange={() => {
-                this.onLanguageChange.bind(this);
+                  this.onLanguageChange.bind(this);
                 }}
                 defaultChecked={this.state.language == "en"}
               />
             </div>
-          {window.app.i18n.localLanguages.map((dLang) => (
-          <div key={dLang} className="form-row">
-            <FormField
-              type="radio"
-              name="language"
-              key={dLang}
-              label={window.app.i18n.resLang(dLang)}
-              onChange={() => {
-              this.onLanguageChange.bind(this);
-              }}
-              defaultChecked={this.state.language == dLang}
-            />
+            {window.app.i18n.localLanguages.map(dLang =>
+              <div key={dLang} className="form-row">
+                <FormField
+                  type="radio"
+                  name="language"
+                  key={dLang}
+                  label={window.app.i18n.resLang(dLang)}
+                  onChange={() => {
+                    this.onLanguageChange.bind(this);
+                  }}
+                  defaultChecked={this.state.language == dLang}
+                />
+              </div>
+            )}
           </div>
-          ))}
-      </div>
-     </section>
+        </section>
         <section className="card">
           <div className="card__content">
             <h3>{__("Download Directory")}</h3>
diff --git a/ui/js/selectors/app.js b/ui/js/selectors/app.js
index d9b743d2a..5265a3df1 100644
--- a/ui/js/selectors/app.js
+++ b/ui/js/selectors/app.js
@@ -194,5 +194,5 @@ export const selectBadgeNumber = createSelector(
 
 export const selectCurrentLanguage = createSelector(
   _selectState,
-  (state) => state.currentLanguage || "en"
-)
\ No newline at end of file
+  state => state.currentLanguage || "en"
+);