diff --git a/templates/web/admin/fields/index.html.twig b/templates/web/admin/fields/index.html.twig
index e8198a324f..531ef168eb 100644
--- a/templates/web/admin/fields/index.html.twig
+++ b/templates/web/admin/fields/index.html.twig
@@ -27,3 +27,17 @@
 
 {# bootstrap admin field backbone application #}
 <script type="text/javascript" src="{{ path('minifier', { 'f' : '/scripts/apps/admin/fields/main.js' }) }}"></script>
+
+<script type="text/javascript">
+    $(document).ready(function () {
+        $('#admin-field-app').on('change', '#tbranch', function () {
+            if ($(this).val() === '') {
+                $('#generate_cterms').prop('checked', false);
+                $('.generate-cterms').addClass('hidden');
+            } else {
+                $('.generate-cterms').removeClass('hidden');
+            }
+            return false;
+        });
+    });
+</script>
diff --git a/templates/web/admin/fields/templates.html.twig b/templates/web/admin/fields/templates.html.twig
index 0dc661fc5c..a021a296c2 100644
--- a/templates/web/admin/fields/templates.html.twig
+++ b/templates/web/admin/fields/templates.html.twig
@@ -261,12 +261,14 @@
                 </tr>
                 <tr>
                     <td><label for="tbranch">{% trans %}Thesaurus branch{% endtrans %}</label></td>
-                    <td><input id="tbranch" type="text" value="<%= field.tbranch %>"/></td>
-                </tr>
-                <tr>
-                    <td><label for="generate_cterms" class="checkbox">{% trans %}Generate-cterms{% endtrans %}</label></td>
-                    <td><input id="generate_cterms" type="checkbox" <%= field.generate_cterms ? "checked='checked'" : "" %> /></td>
-                </tr>
+                    <td>
+                        <input id="tbranch" type="text" value="<%= field.tbranch %>"/>
+                        <div style="display: inline-block;" <%= (field.tbranch == "") ? "class='generate-cterms hidden'" : "generate-cterms" %>>
+                            <label for="generate_cterms" class="checkbox">
+                                <input id="generate_cterms" type="checkbox" <%= field.generate_cterms ? "checked='checked'" : "" %> />
+                                {% trans %}Generate-cterms{% endtrans %}</label>
+                        </div>
+                    </td>
             </table>
         </div>
     </div>