--- a/ckanext/example/theme/templates/forms/dataset_form.html
+++ b/ckanext/example/theme/templates/forms/dataset_form.html
@@ -144,8 +144,8 @@
     <dd class="tags-instructions field_error" py:if="errors.get('tag_string', '')">${errors.get('tag_string', '')}</dd>
   </dl>
 
-  <h3>Musical Genre</h3>
-  <dl>
+  <h3 py:if="c.genre_tags">Musical Genre</h3>
+  <dl py:if="c.genre_tags">
     <dt class="tags-label"><label class="field_opt" for="tags_vocab">Tags</label></dt>
     <dd class="tags-field">
       <select id="genre_tags" class="chzn-select" name="genre_tags" size="60" multiple="multiple">
@@ -160,8 +160,8 @@
     <dd class="tags-instructions field_error" py:if="errors.get('genre_tag_string', '')">${errors.get('genre_tag_string', '')}</dd>
   </dl>
 
-  <h3>Composer</h3>
-  <dl>
+  <h3 py:if="c.composer_tags">Composer</h3>
+  <dl py:if="c.composer_tags">
     <dt class="tags-label"><label class="field_opt" for="tags_vocab">Tags</label></dt>
     <dd class="tags-field">
       <select id="composer_tags" class="chzn-select" name="composer_tags" size="60" multiple="multiple">