diff --git a/views/bootstrap/class.ReceiptDocument.php b/views/bootstrap/class.ReceiptDocument.php
index 74cbc9ce1..db8f2fab8 100644
--- a/views/bootstrap/class.ReceiptDocument.php
+++ b/views/bootstrap/class.ReceiptDocument.php
@@ -117,7 +117,8 @@ $(document).ready(function() {
 	<form class="form-horizontal" method="post" action="../op/op.ReceiptDocument.php" id="form<?= $receipttype ?>" name="form<?= $receipttype ?>">
 	<?php echo createHiddenFieldWithKey('receiptdocument'); ?>
 <?php
-		$this->contentContainerStart();
+		if (!$noreceiptcomment || $receiptreject)
+			$this->contentContainerStart();
 		if(!$noreceiptcomment) {
 			$this->formField(
 				getMLText("comment"),
@@ -149,7 +150,8 @@ $(document).ready(function() {
 		} else {
 			echo '<input type="hidden" name="receiptStatus" value="1" />';
 		}
-		$this->contentContainerEnd();
+		if (!$noreceiptcomment || $receiptreject)
+			$this->contentContainerEnd();
 		$this->formSubmit(getMLText('submit_receipt'), $receipttype.'Receipt');
 ?>
 		<input type='hidden' name='receiptType' value='<?= $receipttype ?>'/>
@@ -164,4 +166,3 @@ $(document).ready(function() {
 		$this->htmlEndPage();
 	} /* }}} */
 }
-?>