diff --git a/calendar/amd/src/modal_event_form.js b/calendar/amd/src/modal_event_form.js
index 2401ac5ab62..1b07e9894f5 100644
--- a/calendar/amd/src/modal_event_form.js
+++ b/calendar/amd/src/modal_event_form.js
@@ -429,6 +429,7 @@ define([
 
                     // No problemo! Our work here is done.
                     this.hide();
+                    this.destroy();
 
                     // Trigger the appropriate calendar event so that the view can be updated.
                     if (isExisting) {
diff --git a/calendar/classes/local/event/forms/create.php b/calendar/classes/local/event/forms/create.php
index ff9407be6ff..62552187ea8 100644
--- a/calendar/classes/local/event/forms/create.php
+++ b/calendar/classes/local/event/forms/create.php
@@ -110,6 +110,8 @@ class create extends \moodleform {
         // Add the form elements for repeating events.
         $this->add_event_repeat_elements($mform);
 
+        $this->_form->addElement('tags', 'tag');
+
         // Add the javascript required to enhance this mform.
         $PAGE->requires->js_call_amd('core_calendar/event_form', 'init', [$mform->getAttribute('id')]);
     }