diff --git a/gui/default/assets/css/overrides.css b/gui/default/assets/css/overrides.css
index 410e59733..b2d93950a 100644
--- a/gui/default/assets/css/overrides.css
+++ b/gui/default/assets/css/overrides.css
@@ -506,3 +506,10 @@ ul.three-columns li, ul.two-columns li {
   padding-top: 6px;
   padding-bottom: 6px;
 }
+
+/* CJK languages don't use italic at all, hence don't force it on them. */
+html[lang|="zh"] i,
+html[lang="ja"] i,
+html[lang|="ko"] i {
+    font-style: normal;
+}
diff --git a/gui/default/syncthing/core/localeService.js b/gui/default/syncthing/core/localeService.js
index 868f400a3..8486df768 100644
--- a/gui/default/syncthing/core/localeService.js
+++ b/gui/default/syncthing/core/localeService.js
@@ -99,6 +99,7 @@ angular.module('syncthing.core')
             function useLocale(language, save2Storage) {
                 if (language) {
                     $translate.use(language).then(function () {
+                        document.documentElement.setAttribute("lang", language);
                         if (save2Storage && _localStorage)
                             _localStorage[_SYNLANG] = language;
                     });