diff --git a/image_optimizer_nat_OC_20_22_1_2_0.ocmod.zip b/image_optimizer_nat_OC_20_22_1_2_0.ocmod.zip
index 43d8091..80f63e3 100644
Binary files a/image_optimizer_nat_OC_20_22_1_2_0.ocmod.zip and b/image_optimizer_nat_OC_20_22_1_2_0.ocmod.zip differ
diff --git a/upload/admin/view/template/module/img_opti.tpl b/upload/admin/view/template/module/img_opti.tpl
index c87ffad..940009c 100644
--- a/upload/admin/view/template/module/img_opti.tpl
+++ b/upload/admin/view/template/module/img_opti.tpl
@@ -2103,6 +2103,9 @@ $(document).ready(function() {
         $('#grid-container').slideUp();
         gridData = [];
         var tool = $(this).val();
+        if (tool) {
+            localStorage.setItem('nat_selected_tool_img_opti', tool);
+        }
         
         if (tool && toolDescriptions[tool]) {
             $('#tool-help-text').html('<i class="fa fa-info-circle"></i> ' + toolDescriptions[tool]).slideDown();
@@ -3199,7 +3202,7 @@ $('#import-settings-file').on('change', function() {
     this.value = '';
 });
 
-// ============ PERSIST ACTIVE TAB ============
+// ============ PERSIST ACTIVE TAB & TOOL ============
 $(document).ready(function() {
     var activeTab = localStorage.getItem('nat_active_tab_img_opti');
     if (activeTab) {
@@ -3208,6 +3211,11 @@ $(document).ready(function() {
     $('.nav-tabs').first().on('shown.bs.tab', 'a[data-toggle="tab"]', function(e) {
         localStorage.setItem('nat_active_tab_img_opti', $(e.target).attr('href'));
     });
+
+    var savedTool = localStorage.getItem('nat_selected_tool_img_opti');
+    if (savedTool && $('#tool-selector option[value="' + savedTool + '"]').length) {
+        $('#tool-selector').val(savedTool).trigger('change');
+    }
 });
 </script>