diff --git a/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html b/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
index 47362fb0f..f8cfad616 100644
--- a/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
@@ -39,12 +39,14 @@
         <div style="padding-top: 0px;">
             <div class="row form-group pagination-box filter-box" style="display: none;">
                 <div class="col-sm-12 inline-content-fr">
-                    <div class="inline" data-id="colManager"></div>
                     {{#if isSearchTab}}
-                    <button type="button" data-id="downloadSearchResult" class="download-results btn btn-action btn-sm" title="Download Search Results">
-                        <i class="fa fa-download" aria-hidden="true"></i>&nbsp;&nbsp;Download
-                    </button>
+                    <div class="inline">
+                        <button type="button" data-id="downloadSearchResult" class="download-results btn btn-action btn-sm" title="Download Search Results">
+                            <i class="fa fa-download" aria-hidden="true"></i>&nbsp;&nbsp;Download
+                        </button>
+                    </div>
                     {{/if}}
+                    <div class="inline" data-id="colManager"></div>
                     <div class="inline">
                         <a href="javascript:void(0)" class="multiSelectTag assignTag btn btn-action btn-sm" style="display:none" title="Assign Classification" data-id="addAssignTag"><i class="fa fa-plus"></i>&nbsp;Classification</a>
                     </div>
diff --git a/dashboardv3/public/js/templates/search/SearchResultLayoutView_tmpl.html b/dashboardv3/public/js/templates/search/SearchResultLayoutView_tmpl.html
index 3493972fe..6aa3fe185 100644
--- a/dashboardv3/public/js/templates/search/SearchResultLayoutView_tmpl.html
+++ b/dashboardv3/public/js/templates/search/SearchResultLayoutView_tmpl.html
@@ -38,16 +38,18 @@
         <div class="pagination-box clearfix row" style="display: none;{{#unless isSearchTab}}margin-top: 0px;{{/unless}}">
             <div class="form-group filter-box col-md-12" {{#if isSearchTab}} style="position: absolute;right: 0;top: -44px; padding: 0;width:auto" {{/if}}>
                 <div class="pull-right inline-content-fr no-padding-left">
+                    {{#if isSearchTab}}
+                    <div class="inline">
+                        <button type="button" data-id="downloadSearchResult" class="btn btn-action btn-sm" title="Download Search Results">
+                            <i class="fa fa-download" aria-hidden="true"></i>&nbsp;&nbsp;Download
+                        </button>
+                    </div>
+                    {{/if}}
                     <div class="inline" data-id="colManager"></div>
                     {{#if isSearchTab}}
                     {{#if entityCreate}}
                     <div class="inline"><button class="btn btn-action btn-sm" data-id="createEntity"><i class="fa fa-plus"></i>&nbsp;Create Entity</button></div>
                     {{/if}}
-                    {{#if isSearchTab}}
-                    <button type="button" data-id="downloadSearchResult" class="btn btn-action btn-sm" title="Download Search Results">
-                        <i class="fa fa-download" aria-hidden="true"></i>&nbsp;&nbsp;Download
-                    </button>
-                    {{/if}}
                     <div class="inline"><button title="Save as custom filter" class="btn btn-action btn-sm" data-id="saveFilter"><i class="fa fa-save"></i>&nbsp;Save Filter</button></div>
                     {{/if}}
                     <div class="inline">