diff --git a/themes/bootstrap3/templates/search/searchbox.phtml b/themes/bootstrap3/templates/search/searchbox.phtml
index 5fd92af3e765d8872d7dc29718a76509a7a540b5..d95da1de0797285343ebc3fdeec41f086b94a52d 100644
--- a/themes/bootstrap3/templates/search/searchbox.phtml
+++ b/themes/bootstrap3/templates/search/searchbox.phtml
@@ -19,26 +19,15 @@
 ?>
 <? if ($this->searchType == 'advanced'): ?>
   <div id="searchForm">
-    <? $searchTabs = $this->searchtabs($this->searchClassId, $this->lookfor, $this->searchIndex, $this->searchType); ?>
-    <? if (count($searchTabs) > 0): ?>
-      <ul class="nav nav-tabs">
-      <? foreach ($searchTabs as $tab): ?>
-        <li<?=$tab['selected'] ? ' class="active"' : ''?>>
-          <a href="<?=$tab['selected'] ? '' : $this->escapeHtmlAttr($tab['url'])?>"><?=$this->transEsc($tab['label']); ?></a>
-        </li>
-      <? endforeach; ?>
-      </ul>
-      <div class="tab-content clearfix">
-    <? endif; ?>
-    <p><?=$this->transEsc("Your search terms")?> : "<strong><?=$this->escapeHtml($this->lookfor)?>"</strong></p>
-    <p class="adv_search_links">
-      <a href="<?=$this->url($advSearch)?>?edit=<?=$this->escapeHtmlAttr($this->searchId)?>"><?=$this->transEsc("Edit this Advanced Search")?></a>
-      <a href="<?=$this->url($advSearch)?>"><?=$this->transEsc("Start a new Advanced Search")?></a>
-      <a href="<?=$this->url($searchHome)?>"><?=$this->transEsc("Start a new Basic Search")?></a>
-    </p>
-    <? if (count($searchTabs) > 0): ?>
-      </div>
-    <? endif; ?>
+    <? $tabs = $this->render('search/searchTabs'); ?>
+    <? if (!empty($tabs)): ?><?=$tabs ?><div class="tab-content clearfix"><? endif; ?>
+      <p class="navbar-text"><?=$this->transEsc("Your search terms")?> : "<strong><?=$this->escapeHtml($this->lookfor)?>"</strong></p>
+      <p class="adv_search_links">
+        <a class="navbar-text" href="<?=$this->url($advSearch)?>?edit=<?=$this->escapeHtmlAttr($this->searchId)?>"><?=$this->transEsc("Edit this Advanced Search")?></a>
+        <a class="navbar-text" href="<?=$this->url($advSearch)?>"><?=$this->transEsc("Start a new Advanced Search")?></a>
+        <a class="navbar-text" href="<?=$this->url($searchHome)?>"><?=$this->transEsc("Start a new Basic Search")?></a>
+      </p>
+    <? if (!empty($tabs)): ?></div><? endif; ?>
   </div>
 <? else: ?>
   <form role="search" class="navbar-form navbar-left" method="get" action="<?=$this->url($basicSearch)?>" name="searchForm" id="searchForm" autocomplete="off">