diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c28f71..2cfea78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 
 - Fixed an issue where a group could be added to a ticket even though it did not have the necessary permissions
+- Fix tab redirect after save
 
 ## Add
 
diff --git a/composer.json b/composer.json
index 3e53354..bdfda55 100644
--- a/composer.json
+++ b/composer.json
@@ -2,10 +2,8 @@
     "require": {
         "php": ">=8.2"
     },
-    "require-dev": {
-        "glpi-project/tools": "^0.7"
-    },
     "config": {
+        "autoloader-suffix": "PluginMoreoptions",
         "optimize-autoloader": true,
         "platform": {
             "php": "8.2.99"
diff --git a/templates/config.html.twig b/templates/config.html.twig
index 53ddcbd..6a52a49 100644
--- a/templates/config.html.twig
+++ b/templates/config.html.twig
@@ -66,13 +66,14 @@
  #}
 
 <div class="asset mo-config">
-    <form action="{{ path('plugins/moreoptions/front/config.form.php') }}" method="post">
+    <form id="mo-config-form-{{ rand }}" action="{{ path('plugins/moreoptions/front/config.form.php') }}" method="post">
         <ul class="nav nav-tabs" role="tablist">
             {% for tab in tabs %}
                 <li class="nav-item">
                     <a
                         class="nav-link {{ loop.first ? 'active' : '' }}"
                         id="mo-tab-{{ tab.id }}-{{ rand }}"
+                        data-mo-tab="{{ tab.id }}"
                         data-bs-toggle="tab"
                         href="#mo-pane-{{ tab.id }}-{{ rand }}"
                         role="tab"
@@ -134,3 +135,29 @@
         {{ include('components/form/buttons.html.twig') }}
     </form>
 </div>
+
+<script>
+    (() => {
+        // The page is reloaded once saved: back on the tab it was saved from.
+        const form = document.getElementById('mo-config-form-{{ rand }}');
+        const key = 'moreoptions_config_tab';
+        try {
+            const saved = sessionStorage.getItem(key);
+            sessionStorage.removeItem(key);
+            const tab = saved !== null ? form.querySelector(`[data-mo-tab="${CSS.escape(saved)}"]`) : null;
+            if (tab !== null) {
+                bootstrap.Tab.getOrCreateInstance(tab).show();
+            }
+        } catch {
+            // No storage (private browsing): the first tab is shown.
+        }
+
+        form.addEventListener('submit', () => {
+            try {
+                sessionStorage.setItem(key, form.querySelector('.nav-link.active')?.dataset.moTab ?? '');
+            } catch {
+                // Same
+            }
+        });
+    })();
+</script>