diff --git a/sounds/templatetags/bst_category.py b/sounds/templatetags/bst_category.py
index cdefa2847..dc68a532b 100644
--- a/sounds/templatetags/bst_category.py
+++ b/sounds/templatetags/bst_category.py
@@ -10,6 +10,8 @@ def bst_taxonomy_category_key_to_category_names(category_key):
     This includes both the top level and the sub level category names.
     E.g.: "m-sp" -> ("Music", "Solo percussion"), "m" -> ("Music", None)
     """
+    if category_key is None:
+        return (None, None)
     if '-' in category_key:
         # Sub level category key
         top_level_key = category_key.split('-')[0]
diff --git a/templates/molecules/bst_category_form_field.html b/templates/molecules/bst_category_form_field.html
index 93353e96d..12c6d2d19 100644
--- a/templates/molecules/bst_category_form_field.html
+++ b/templates/molecules/bst_category_form_field.html
@@ -26,7 +26,7 @@
         <div class="v-spacing-top-2 line-height-50">
             {% for value, label in form.fields.bst_category.choices %}
                 {% if "-" in value %}
-                    <button type="button" class="btn no-hover {% if value == form.bst_category.value %}btn-primary{% else %}btn-inverse{% endif %} btn-subcategory tooltip_top" top_level="{{ value|get_top_level_bst_category }}" data_value="{{ value }}">
+                    <button type="button" class="btn no-hover {% if value == form.bst_category.value %}btn-primary{% else %}btn-inverse{% endif %} btn-subcategory tooltip_top" top_level="{{ value|get_bst_taxonomy_top_level_category_key }}" data_value="{{ value }}">
                         {{ label }}
                         {% for item in bst_taxonomy %}
                             {% if item.key == value %}
diff --git a/templates/sounds/display_sound.html b/templates/sounds/display_sound.html
index e8640ed0a..002a5089b 100644
--- a/templates/sounds/display_sound.html
+++ b/templates/sounds/display_sound.html
@@ -42,7 +42,15 @@ <h5 class="ellipsis">
                     {% for tag in sound.tag_array%}
                         {% bw_tag tag %}
                     {% endfor %}
-                    <div class="v-spacing-top-1" title="{{ sound.description|striptags|safe|force_escape }}">
+                    {% with sound.get_category_names as cat_names %}
+                        {% if cat_names.0 is not None %} 
+                            <div class="ellipsis text-grey v-spacing-top-1">
+                                {% bw_icon 'box-add' %}
+                                {{ cat_names.0 }}{% if cat_names.1 %} > {{ cat_names.1}}{% endif %}
+                            </div>
+                        {% endif %}
+                    {% endwith %}
+                    <div class="" title="{{ sound.description|striptags|safe|force_escape }}">
                         {{ sound.description|safe|linebreaks }}
                     </div>
                 </div>