diff --git a/app/views/phases/_guidances_notes.html.erb b/app/views/phases/_guidances_notes.html.erb
index 85ff945..952b078 100644
--- a/app/views/phases/_guidances_notes.html.erb
+++ b/app/views/phases/_guidances_notes.html.erb
@@ -7,14 +7,14 @@
   <ul class="nav nav-pills nav-justified" role="tablist">
       <% if guidances_active %>
           <li role="presentation" class="active">
-              <a href="#guidances-<%= question.id %>" aria-controls="guidances-<%= question.id %>" role="tab" data-toggle="tab">
+              <a href="#guidances-<%= question.id %>" aria-controls="guidances-<%= question.id %>" role="tab" data-toggle="pill">
                   <%= _('Guidance') %>
               </a>
           </li>
       <% end %>
       <% if plan.present? %>
           <li role="presentation" class="<%= 'active' if !guidances_active %>">
-              <a href="#notes-<%= question.id %>" aria-controls="notes-<%= question.id %>" role="tab" data-toggle="tab">
+              <a href="#notes-<%= question.id %>" aria-controls="notes-<%= question.id %>" role="tab" data-toggle="pill">
                   <span id="notes-title-<%= question.id %>">
                       <%= render partial: '/notes/title', locals: { answer: answer } %>
                   </span>
diff --git a/lib/assets/javascripts/utils/tabHelper.js b/lib/assets/javascripts/utils/tabHelper.js
index b9ef598..63f9958 100644
--- a/lib/assets/javascripts/utils/tabHelper.js
+++ b/lib/assets/javascripts/utils/tabHelper.js
@@ -7,8 +7,8 @@
     $(`ul.nav a[href="${loc}"]`).tab('show');
   }
   $('ul.nav a[data-toggle="tab"]').click((e) => {
-    $(e.currentTarget).tab('show');
-    window.location.hash = $(e.currentTarget).attr('href');
-    window.scrollTo(0, 0);
+    const target = $(e.target);
+    $(target).tab('show');
+    window.location.hash = $(target).attr('data-target');
   });
 });