diff --git a/app/assets/javascripts/repositories/repository_datatable.js b/app/assets/javascripts/repositories/repository_datatable.js
index c937493af..63a2008a2 100644
--- a/app/assets/javascripts/repositories/repository_datatable.js
+++ b/app/assets/javascripts/repositories/repository_datatable.js
@@ -90,6 +90,8 @@ var RepositoryDatatable = (function(global) {
         $('#editDeleteCopy').show();
         $('#toolbarPrintLabel').show();
       }
+      $("#team-switch").css({"pointer-events":"visible", "opacity":"1"});
+      $("#navigationGoBtn").prop('disabled', false);
     } else if (currentMode === 'editMode') {
       $(TABLE_WRAPPER_ID).addClass('editing');
       $('.repository-save-changes-link').on('click', function() {
@@ -119,6 +121,8 @@ var RepositoryDatatable = (function(global) {
       $('.dataTables_filter input').prop('disabled', true);
       $('#toolbarPrintLabel').hide();
       $('.repository-edit-overlay').show();
+      $("#team-switch").css({"pointer-events":"none", "opacity":"0.6"});
+      $("#navigationGoBtn").prop('disabled', true);
     }
   }
 
diff --git a/app/views/shared/_left_menu_bar.html.erb b/app/views/shared/_left_menu_bar.html.erb
index 6c353602f..621c77e20 100644
--- a/app/views/shared/_left_menu_bar.html.erb
+++ b/app/views/shared/_left_menu_bar.html.erb
@@ -52,8 +52,7 @@
           <% end %>
         </li>
         <li class="<%= "active" if templates_are_selected? %>">
-          <%= link_to protocols_path, id: "templates-link", title: t('left_menu_bar.templates'),
-                                      data: { turbolinks: false } do %>
+          <%= link_to protocols_path, id: "templates-link", title: t('left_menu_bar.templates') do %>
             <span class="fas fa-edit"></span>
             <span><%= t('left_menu_bar.templates') %></span>
           <% end %>
diff --git a/app/views/shared/_navigation.html.erb b/app/views/shared/_navigation.html.erb
index f3d4a338a..c34af43ce 100644
--- a/app/views/shared/_navigation.html.erb
+++ b/app/views/shared/_navigation.html.erb
@@ -81,8 +81,7 @@
                       <li class="team-name-item">
                         <a href="#"
                           data-id="<%= team.id %>"
-                          class="text-center change-team"
-                          data-turbolinks="false">
+                          class="text-center change-team">
                           <% if current_team == team %>
                             <span class="fas fa-check-circle"></span> <strong><%= team.name %></strong>
                           <% else %>
@@ -122,7 +121,7 @@
                        name="q"
                        placeholder="<%= t('nav.search') %>" />
                 <span class="input-group-btn">
-                  <button class="btn btn-default" type="submit"><%= t 'nav.search_button' %></button>
+                  <button class="btn btn-default" id="navigationGoBtn" type="submit"><%= t 'nav.search_button' %></button>
                 </span>
               </div>
           <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e840da63f..daf944969 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1762,7 +1762,7 @@ en:
           too_long: "Item name is too long (maximum is %{max_length} characters)"
           is_empty: "Item name should be filled"
     pagination_edit_overlay_html: "Please <a class=\"repository-save-changes-link\">save your changes</a> before you go to another page"
-    toolbar_edit_overlay_html: "Please <a class=\"repository-save-changes-link\">save your changes</a> first before using filters"
+    toolbar_edit_overlay_html: "Please <a class=\"repository-save-changes-link\">save your changes</a> first to use filters"
     add_new_record: "New item"
     parse_sheet:
       help_text: "Match the columns of your uploaded file with already existing columns in database."