diff --git a/include/staff/templates/advanced-search-criteria.tmpl.php b/include/staff/templates/advanced-search-criteria.tmpl.php
index 136c7d139bb7a35d382757fe2e534230f79d997a..4390cbc001061cc129676da900cebd3080913e77 100644
--- a/include/staff/templates/advanced-search-criteria.tmpl.php
+++ b/include/staff/templates/advanced-search-criteria.tmpl.php
@@ -88,6 +88,24 @@ foreach ($matches as $path => $F) {
 <?php }
 } ?>
 </select>
+
+<div class="row">
+</br>
+  <label class="checkbox inline"><input id="save-search" type="checkbox" name="save-search"
+
+  onclick="javascript:
+    var form = $(this).closest('form');
+    form.attr('action', form.attr('action') + '/' + <?php echo
+      $search->id ?: "'create'"; ?>);">
+       <?php echo __('Save Search'); ?></label>
+     </br>
+     <input name="name" type="text" size="40" style="margin-top: 5px;"
+       value="<?php echo Format::htmlchars($search->getName()); ?>"
+       placeholder="<?php
+       echo __('Search Title'); ?>"/>
+     <div class="error"><?php echo Format::htmlchars($errors['name']); ?></div>
+</div>
+
 <script>
 $(function() {
   $('#search-add-new-field').on('change', function() {
diff --git a/include/staff/templates/advanced-search.tmpl.php b/include/staff/templates/advanced-search.tmpl.php
index c2cd1c1d442a833807b9adbcf6aeb8c4d4c36d0a..d34f85a8b28c2b286f09824fcf7f65cebd6c592f 100644
--- a/include/staff/templates/advanced-search.tmpl.php
+++ b/include/staff/templates/advanced-search.tmpl.php
@@ -34,15 +34,6 @@ foreach ($queues as $id => $name) {
       </select>
     </div>
    </div>
-   <div class="flex row">
-    <div class="span12">
-      <input name="name" type="text" size="30"
-        value="<?php echo Format::htmlchars($search->getName()); ?>"
-        placeholder="<?php
-        echo __('Enter a title for the search queue'); ?>"/>
-      <div class="error"><?php echo Format::htmlchars($errors['name']); ?></div>
-    </div>
-  </div>
 <ul class="clean tabs">
     <li class="active"><a href="#criteria"><i class="icon-search"></i> <?php echo __('Criteria'); ?></a></li>
     <li><a href="#columns"><i class="icon-columns"></i> <?php echo __('Columns'); ?></a></li>
@@ -84,14 +75,6 @@ foreach ($queues as $id => $name) {
       <button class="button" type="submit" name="submit" value="search"
         id="do_search"><i class="icon-search"></i>
         <?php echo __('Search'); ?></button>
-      <button class="green button" type="submit" name="submit" value="save"
-        onclick="javascript:
-          var form = $(this).closest('form');
-          form.attr('action', form.attr('action') + '/' + <?php echo
-            $search->id ?: "'create'"; ?>);"
-        ><i class="icon-save"></i>
-        <?php echo __('Save'); ?>
-      </button>
     </div>
   </div>