diff --git a/views/bootstrap/class.EditAttributes.php b/views/bootstrap/class.EditAttributes.php
index 80d4c0559..45be4b2ba 100644
--- a/views/bootstrap/class.EditAttributes.php
+++ b/views/bootstrap/class.EditAttributes.php
@@ -45,7 +45,6 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Theme_Style {
 		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 
 		$this->contentHeading(getMLText("edit_attributes"));
-		$this->contentContainerStart();
 ?>
 <form class="form-horizontal" action="../op/op.EditAttributes.php" name="form1" method="POST">
 	<?php echo createHiddenFieldWithKey('editattributes'); ?>
@@ -53,6 +52,7 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Theme_Style {
 	<input type="hidden" name="version" value="<?php print $version->getVersion();?>">
 
 <?php
+		$this->contentContainerStart();
 		if($attrdefs) {
 			foreach($attrdefs as $attrdef) {
 				$arr = $this->callHook('editDocumentContentAttribute', $version, $attrdef);
@@ -75,11 +75,11 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Theme_Style {
 		} elseif(is_string($arrs)) {
 			echo $arrs;
 		}
+		$this->contentContainerEnd();
 		$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
 ?>
 </form>
 <?php
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */