diff --git a/progit/templates/issue.html b/progit/templates/issue.html
index 4930d8b..75c5795 100644
--- a/progit/templates/issue.html
+++ b/progit/templates/issue.html
@@ -55,13 +55,13 @@
                repo=repo.name, tags=tag.tag) }}">
         {{ tag.tag }}</a>{% if not loop.last %},{% endif %}
     {% endfor %}
-    {% if authenticated and tagform %}
+    {% if authenticated and form_tag %}
       <form action="{{ url_for('view_issue', username=username,
                repo=repo.name, issueid=issueid) }}" method="post">
-        {{ render_field(tagform.tags) }}
+        {{ render_field(form_tag.tag) }}
         <input id="add_tags" type="submit"
             class="submit positive button" value="Add">
-        {{ form.csrf_token }}
+        {{ form_tag.csrf_token }}
       </form>
     {% endif %}
 </section>
diff --git a/progit/ui/issues.py b/progit/ui/issues.py
index d3a73ee..8171941 100644
--- a/progit/ui/issues.py
+++ b/progit/ui/issues.py
@@ -220,9 +220,10 @@ def view_issue(repo, issueid, username=None):
     status = progit.lib.get_issue_statuses(SESSION)
 
     form_comment = progit.forms.AddIssueCommentForm()
-    form = None
+    form = form_tag = None
     if authenticated() and is_repo_admin(repo):
         form = progit.forms.UpdateIssueStatusForm(status=status)
+        form_tag = progit.forms.AddIssueTagForm()
 
         if form.validate_on_submit():
             try:
@@ -253,6 +254,7 @@ def view_issue(repo, issueid, username=None):
         issueid=issueid,
         form=form,
         form_comment=form_comment,
+        form_tag=form_tag,
     )