diff --git a/app/assets/javascripts/repositories/repository_datatable.js b/app/assets/javascripts/repositories/repository_datatable.js
index 25ffa9b50..210e480d9 100644
--- a/app/assets/javascripts/repositories/repository_datatable.js
+++ b/app/assets/javascripts/repositories/repository_datatable.js
@@ -263,9 +263,13 @@ var RepositoryDatatable = (function(global) {
   }
 
   function resetTableView() {
+    var filterSaveButtonVisible = !$('#saveRepositoryFilters').hasClass('hidden');
     $.getJSON($(TABLE_ID).data('toolbar-url'), (data) => {
       $('#toolbarButtonsDatatable').remove();
       $(data.html).appendTo('div.toolbar');
+      if (filterSaveButtonVisible) {
+        $('#saveRepositoryFilters').removeClass('hidden');
+      }
       if (typeof initBMTFilter === 'function') initBMTFilter();
     });
 
diff --git a/app/views/repositories/_toolbar_buttons.html.erb b/app/views/repositories/_toolbar_buttons.html.erb
index dfb91b8f9..8fb1be1b8 100644
--- a/app/views/repositories/_toolbar_buttons.html.erb
+++ b/app/views/repositories/_toolbar_buttons.html.erb
@@ -13,36 +13,6 @@
       <span class="hidden-xs"><%= t("repositories.add_new_record") %></span>
     </button>
   <% end %>
-  <% if can_manage_repository_filters?(@repository) %>
-    <div class="repository-cog dropdown hidden" id="saveRepositoryFilters">
-      <button type="button"
-              class="btn btn-default"
-              data-toggle="dropdown"
-              aria-haspopup="true"
-              aria-expanded="true">
-        <span class="fas fa-save"></span>
-        <span class="hidden-xs"><%= t("repositories.show.filters.save_filters") %></span>
-        <span class="caret"></span>
-      </button>
-      <ul class="dropdown-menu">
-        <li id="newFilterLink" data-view-mode="active">
-          <a href="#" data-toggle="modal" data-target="#modalSaveRepositoryTableFilter">
-            <span class="fas fa-plus"></span>
-            <%= t('repositories.show.filters.new_filter') %>
-          </a>
-        </li>
-        <li id="overwriteFilterLink" class="hidden" data-view-mode="active">
-          <a href="#" data-toggle="modal" class="overwrite-link" data-target="#modalSaveRepositoryTableFilter">
-            <span class="fas fa-save"></span>
-            <span class="overwrite-title">
-              <%= t('repositories.show.filters.overwrite_filter') %>
-              <span id="currentFilterName"></span>
-            </span>
-          </a>
-        </li>
-      </ul>
-    </div>
-  <% end %>
 
   <% if can_manage_repository_rows?(@repository) %>
     <span id="editDeleteCopy" data-toggle="buttons" style="display:none">
@@ -115,6 +85,38 @@
       </table>
     <% end %>
   </div>
+
+  <% if can_manage_repository_filters?(@repository) %>
+    <div class="repository-cog dropdown hidden" id="saveRepositoryFilters">
+      <button type="button"
+              class="btn btn-default"
+              data-toggle="dropdown"
+              aria-haspopup="true"
+              aria-expanded="true">
+        <span class="fas fa-save"></span>
+        <span class="hidden-xs"><%= t("repositories.show.filters.save_filters") %></span>
+        <span class="caret"></span>
+      </button>
+      <ul class="dropdown-menu">
+        <li id="newFilterLink" data-view-mode="active">
+          <a href="#" data-toggle="modal" data-target="#modalSaveRepositoryTableFilter">
+            <span class="fas fa-plus"></span>
+            <%= t('repositories.show.filters.new_filter') %>
+          </a>
+        </li>
+        <li id="overwriteFilterLink" class="hidden" data-view-mode="active">
+          <a href="#" data-toggle="modal" class="overwrite-link" data-target="#modalSaveRepositoryTableFilter">
+            <span class="fas fa-save"></span>
+            <span class="overwrite-title">
+              <%= t('repositories.show.filters.overwrite_filter') %>
+              <span id="currentFilterName"></span>
+            </span>
+          </a>
+        </li>
+      </ul>
+    </div>
+  <% end %>
+
   <% if @repository.is_a?(BmtRepository) %>
     <div class="dropdown" id="bmtFiltersDropdownButton">
         <button id="bmtFiltersDropdown"