diff --git a/views/bootstrap/class.Calendar.php b/views/bootstrap/class.Calendar.php
index ef364f11d..d59f8d1b8 100644
--- a/views/bootstrap/class.Calendar.php
+++ b/views/bootstrap/class.Calendar.php
@@ -65,13 +65,13 @@ class SeedDMS_View_Calendar extends SeedDMS_Theme_Style {
 		if($event) {
 //			print_r($event);
 			$this->contentHeading(getMLText('edit_event'));
-			$this->contentContainerStart();
 ?>
 
 <form class="form-horizontal" action="../op/op.EditEvent.php" id="form1" name="form1" method="post">
   <?php echo createHiddenFieldWithKey('editevent'); ?>
 	<input type="hidden" name="eventid" value="<?php echo (int) $event["id"]; ?>">
 <?php
+			$this->contentContainerStart();
 			$this->formField(
 				getMLText("from"),
 				$this->getDateChooser(getReadableDate($event["start"]), "from")
@@ -100,11 +100,11 @@ class SeedDMS_View_Calendar extends SeedDMS_Theme_Style {
 					'required'=>$strictformcheck
 				)
 			);
+			$this->contentContainerEnd();
 			$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php
-			$this->contentContainerEnd();
 			$this->contentHeading(getMLText('rm_event'));
 		$this->contentContainerStart();
 ?>