diff --git a/include/ajax.search.php b/include/ajax.search.php
index 4013d27e4290e3a5ffa3187069a6fa04c1c8fcf4..c4e765c6d68710297d14192ad8cf98078ae1fb6b 100644
--- a/include/ajax.search.php
+++ b/include/ajax.search.php
@@ -128,7 +128,8 @@ class SearchAjaxAPI extends AjaxController {
             else
                 $data[$name] = $info['value'];
         }
-        $form = $search->getForm($data);
+        $form = $search->getForm();
+        $form->setSource($data);
         if (!$data || !$form->isValid()) {
             Http::response(422, 'Validation errors exist on form');
         }
diff --git a/include/staff/templates/advanced-search.tmpl.php b/include/staff/templates/advanced-search.tmpl.php
index 42779cd60cb99fea31525853fe10e13c221dfe25..ae94d4793ca226a5a7647a7a2c109f073bd439ca 100644
--- a/include/staff/templates/advanced-search.tmpl.php
+++ b/include/staff/templates/advanced-search.tmpl.php
@@ -143,11 +143,10 @@ return false;
 <div style="position:absolute;bottom:0">
 <hr>
     <form method="post">
-    <fieldset>
+    <div class="attached input">
     <input name="title" type="text" size="27" placeholder="<?php
         echo __('Enter a title for the search'); ?>"/>
-        <span class="action-button">
-            <a href="#tickets/search/create" onclick="javascript:
+        <a class="attached button" href="#tickets/search/create" onclick="javascript:
 $.ajax({
     url: 'ajax.php/' + $(this).attr('href').substr(1),
     type: 'POST',
@@ -165,8 +164,7 @@ $.ajax({
 });
 return false;
 "><i class="icon-save"></i> <?php echo __('Save'); ?></a>
-        </span>
-    </fieldset>
+    </div>
 </div>
 </div>
 </div>