diff --git a/backend/web/static/base.js b/backend/web/static/base.js
index 9cc508d927f40d9fc9f54b86d15276c55ab933ad..7cf0d0a1fb92b73cdaade3722341cb581c715b0c 100644
--- a/backend/web/static/base.js
+++ b/backend/web/static/base.js
@@ -121,6 +121,8 @@ function flow_settings_validate() {
       // cookie and regenerate a new flow
       if (data.state == 'success') {
         Cookies.set('flow_state', 'settings_saved');
+        var activeTab = $('#pills-tab .active').attr('id');
+        sessionStorage.setItem('settings_tab', activeTab);
 
         // Redirect to generate new flow ID
         window.location.href = 'settings';
@@ -156,6 +158,8 @@ function flow_settings() {
       // notification
       if (state == 'settings_saved') {
         $('#contentProfileSaved').show();
+        var activeTab = sessionStorage.getItem('settings_tab');
+        $('#' + activeTab).tab('show');
         Cookies.set('flow_state', 'settings');
       }