diff --git a/apps/cfp_review/base.py b/apps/cfp_review/base.py
index decfcd8b4..c006e9478 100644
--- a/apps/cfp_review/base.py
+++ b/apps/cfp_review/base.py
@@ -36,6 +36,7 @@
     EVENT_SPACING,
     FavouriteProposal,
 )
+from models.cfp_tag import Tag
 from models.user import User
 from models.purchase import Ticket
 from .forms import (
@@ -343,6 +344,7 @@ def log_and_close(msg, next_page, proposal_id=None):
     form.state.data = prop.state
     form.title.data = prop.title
     form.description.data = prop.description
+    form.tags.data = Tag.serialise_tags(prop.tags)
     form.requirements.data = prop.requirements
     form.length.data = prop.length
     form.notice_required.data = prop.notice_required
diff --git a/apps/cfp_review/forms.py b/apps/cfp_review/forms.py
index 3f38607fc..8c29c0bf0 100644
--- a/apps/cfp_review/forms.py
+++ b/apps/cfp_review/forms.py
@@ -14,6 +14,7 @@
 from wtforms.validators import DataRequired, Optional, NumberRange, ValidationError
 
 from models.cfp import Venue, ORDERED_STATES
+from models.cfp_tag import Tag
 from ..common.forms import Form, HiddenIntegerField, EmailField
 
 from dateutil.parser import parse as parse_date
@@ -24,6 +25,7 @@ class UpdateProposalForm(Form):
     state = SelectField("State", choices=[(s, s) for s in ORDERED_STATES])
     title = StringField("Title", [DataRequired()])
     description = TextAreaField("Description", [DataRequired()])
+    tags = StringField("Tags")
     requirements = TextAreaField("Requirements")
     length = StringField("Length")
     notice_required = SelectField(
@@ -94,6 +96,7 @@ def validate_allowed_times(self, field):
     def update_proposal(self, proposal):
         proposal.title = self.title.data
         proposal.description = self.description.data
+        proposal.tags = Tag.parse_serialised_tags(self.tags.data)
         proposal.requirements = self.requirements.data
         proposal.length = self.length.data
         proposal.notice_required = self.notice_required.data
diff --git a/templates/cfp_review/update_proposal.html b/templates/cfp_review/update_proposal.html
index d645d231f..3b0b147eb 100644
--- a/templates/cfp_review/update_proposal.html
+++ b/templates/cfp_review/update_proposal.html
@@ -34,6 +34,7 @@ <h2>{{proposal.published_title or proposal.title}}<br>
             {{ render_dl_field(form.state) }}
             {{ render_dl_field(form.title) }}
             {{ render_dl_field(form.description, rows=8) }}
+            {{ render_dl_field(form.tags) }}
             {{ render_dl_field(form.requirements, rows=3) }}
             {{ render_dl_field(form.length) }}
             {{ render_dl_field(form.notice_required) }}