diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 16fadd479..ecd602940 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -340,8 +340,8 @@ function typeahead() { /* {{{ */
 				}
 			}
 		}
-		$this->formSubmit("<i class=\"fa fa-search\"></i> ".getMLText('search'));
 		$this->contentContainerEnd();
+		$this->formSubmit("<i class=\"fa fa-search\"></i> ".getMLText('search'));
 		// }}}
 
 		// Seach options for documents {{{
@@ -369,31 +369,23 @@ function typeahead() { /* {{{ */
 			$openfilterdlg = true;
 		if($statusdate)
 			$openfilterdlg = true;
-?>
-<?php if($totaldocs): ?>
-<div class="accordion" id="accordion1">
-  <div class="accordion-group">
-    <div class="accordion-heading">
-      <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion1" href="#collapseExport">
-        <?php printMLText('export'); ?>
-      </a>
-    </div>
-    <div id="collapseExport" class="accordion-body">
-      <div class="accordion-inner">
-<table class="table-condensed">
-<tr>
-<td><?= getMLText('content') ?></td><td><label class="checkbox inline"><input id="includecontent" type="checkbox" name="includecontent" value="1"> <?php printMLText("include_content"); ?></label></td>
-</tr>
-<tr>
-<td></td><td><a id="export" class="btn" href="<?= $_SERVER['REQUEST_URI']."&action=export" ?>"><i class="fa fa-download"></i> Export</a></td>
-</tr>
-</table>
-      </div>
-    </div>
-  </div>
-</div>
-<?php endif; ?>
-<?php
+
+		if($totaldocs) {
+			ob_start();
+			$this->formField(
+				getMLText("include_content"),
+				array(
+					'element'=>'input',
+					'type'=>'checkbox',
+					'name'=>'includecontent',
+					'value'=>1,
+				)
+			);
+			$this->formSubmit("<i class=\"fa fa-download\"></i> ".getMLText('export'));
+			$content = ob_get_clean();
+			$this->printAccordion(getMLText('export'), $content);
+		}
+
 		/* Start of fields only applicable to documents */
 		ob_start();
 		$tmpcatids = array();