diff --git a/source/app/blueprints/manage/templates/modal_case_info_from_case.html b/source/app/blueprints/manage/templates/modal_case_info_from_case.html
index b741f39c4..cf096eade 100644
--- a/source/app/blueprints/manage/templates/modal_case_info_from_case.html
+++ b/source/app/blueprints/manage/templates/modal_case_info_from_case.html
@@ -62,8 +62,8 @@ <h4>General info <button class="ml-2 btn btn-sm float-right" onclick="edit_case_
                             </div>
                             <div class="form-group mt--3">
                                 <label>Case tags :</label>
-                                <span type="text" class="text-faded">{% if data.tags %} {% for tag in data.case_tags %}
-                                    <span class="badge badge-pill badge-light ml-1"><i class="fa fa-tag mr-1"></i>{{ tag }}</span> {% endfor %}{% endif %}</span>
+                                <span type="text" class="text-faded">{% if data.tags %} {% for tag in data.tags %}
+                                    <span class="badge badge-pill badge-light ml-1"><i class="fa fa-tag mr-1"></i>{{ tag.tag_title }}</span> {% endfor %}{% endif %}</span>
                             </div>
                             <div class="form-group mt--3">
                                 <label>SOC ID :</label>
@@ -262,7 +262,7 @@ <h4 class=" pb-3">Edit case information</h4>
                                     <label for="asset_tags">Case tags
                                     </label>
                                     <input type="text" id="case_tags"
-                                        class="form-control col-md-12" {% if data.case_tags %} value="{{ data.case_tags }}" {% endif %}/>
+                                        class="form-control col-md-12" {% if data.tags %} value="{% for tag in data.tags %}{{ tag.tag_title }},{% endfor %}" {% endif %}/>
                                 </div>
                                 <div class="form-group px-4 py-4 mt-3" id="protagonists_form_group">
                                     {% if protagonists %}