diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc
index 0f8cb9d6de0c7e699eaac413b503dcda9642a627..8c4cf014c352839a8fa10aea7dacea8d2ede10fe 100644
--- a/src/QGCApplication.cc
+++ b/src/QGCApplication.cc
@@ -391,12 +391,6 @@ void QGCApplication::setLanguage()
             break;
         case 12:
             locale = QLocale(QLocale::Korean);
-            if(QFontDatabase::addApplicationFont(":/fonts/NanumGothic-Regular") < 0) {
-                qWarning() << "Could not load /fonts/NanumGothic-Regular font";
-            }
-            if(QFontDatabase::addApplicationFont(":/fonts/NanumGothic-Bold") < 0) {
-                qWarning() << "Could not load /fonts/NanumGothic-Bold font";
-            }
             break;
         case 13:
             locale = QLocale(QLocale::Norwegian);
@@ -421,6 +415,16 @@ void QGCApplication::setLanguage()
             break;
         }
     }
+    //-- We have specific fonts for Korean
+    if(locale == QLocale::Korean) {
+        qDebug() << "Loading Korean fonts" << locale.name();
+        if(QFontDatabase::addApplicationFont(":/fonts/NanumGothic-Regular") < 0) {
+            qWarning() << "Could not load /fonts/NanumGothic-Regular font";
+        }
+        if(QFontDatabase::addApplicationFont(":/fonts/NanumGothic-Bold") < 0) {
+            qWarning() << "Could not load /fonts/NanumGothic-Bold font";
+        }
+    }
     qDebug() << "Loading localization for" << locale.name();
     _app->removeTranslator(&_QGCTranslator);
     _app->removeTranslator(&_QGCTranslatorQt);