diff --git a/application/views/questionAdministration/answerOptions.twig b/application/views/questionAdministration/answerOptions.twig
index 19a56752821..0a7079adcd0 100644
--- a/application/views/questionAdministration/answerOptions.twig
+++ b/application/views/questionAdministration/answerOptions.twig
@@ -6,7 +6,7 @@
 
 <!-- Loop all language, and then hide all but the current selected one with JS. -->
 {% for lang in allLanguages %}
-    <div class="lang-hide lang-{{ lang }}">
+    <div class="lang-hide lang-{{ lang }} {{ first ? 'base-lang' : 'extra-lang' }}">
         {% for scale_id in range(0, scalecount - 1) %}
 
             {% set position = 1 %}
diff --git a/application/views/questionAdministration/subquestions.twig b/application/views/questionAdministration/subquestions.twig
index 9d8b297cae2..a18dc9ff62a 100644
--- a/application/views/questionAdministration/subquestions.twig
+++ b/application/views/questionAdministration/subquestions.twig
@@ -6,7 +6,7 @@
 
 <!-- Loop all language, and then hide all but the current selected one with JS. -->
 {% for lang in allLanguages %}
-    <div class="lang-hide lang-{{ lang }}">
+    <div class="lang-hide lang-{{ lang }} {{ first ? 'base-lang' : 'extra-lang' }}">
         {% for scale_id in range(0, scalecount - 1) %}
             {% set anscount = subquestions|length %}
             {# TODO : check the rendering of XSCALES / Y SCALES #}
diff --git a/assets/scripts/admin/questionEditor.js b/assets/scripts/admin/questionEditor.js
index 078bc685959..5a905efcc67 100644
--- a/assets/scripts/admin/questionEditor.js
+++ b/assets/scripts/admin/questionEditor.js
@@ -2022,6 +2022,16 @@ $(document).on('ready pjax:scriptcomplete', function () {
     }
   }
 
+  /**
+   * Updates the answer/subquestion code on secondary languages
+   */
+  function syncAnswerSubquestionCode() {
+    const itemCode = $(this).val();
+    const commonId = $(this).closest('tr').data('common-id');
+
+    $(this).closest('.tab-pane').find(".extra-lang tr[data-common-id='" + commonId + "'] td.code-title").text(itemCode);
+  }
+
   // Below, things run on pjax:scriptcomplete.
 
     makeAnswersTableSortable();
@@ -2137,4 +2147,7 @@ $(document).on('ready pjax:scriptcomplete', function () {
     });
     
     $('#relevance').on('keyup', showConditionsWarning);
+
+    $(document).on('focusout', '#subquestions table.subquestions-table:first-of-type td.code-title input.code', syncAnswerSubquestionCode);
+    $(document).on('focusout', '#answeroptions table.answeroptions-table:first-of-type td.code-title input.code', syncAnswerSubquestionCode);
 });