diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index cb3f3238..07582a63 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -766,5 +766,13 @@
   "placeholder_full_tags_list": {
     "message": "Existing tags",
     "description": ""
+  },
+  "prefs_OptionText_add_tags_maxnum": {
+    "message": "Maximum number of tags",
+    "description": ""
+  },
+  "prefs_OptionText_add_tags_maxnum_Info": {
+    "message": "The maximum number of tags proposed by the AI.",
+    "description": ""
   }
 }
\ No newline at end of file
diff --git a/options/mzta-options-default.js b/options/mzta-options-default.js
index 34b51b14..5f5470cf 100644
--- a/options/mzta-options-default.js
+++ b/options/mzta-options-default.js
@@ -38,4 +38,5 @@ export const prefs_default = {
     placeholders_use_default_value: false,
     max_prompt_length: 30000,   // max string length for prompt
     add_tags: false,
+    add_tags_maxnum: 3,
 }
\ No newline at end of file
diff --git a/options/mzta-options.html b/options/mzta-options.html
index 015da2cc..980dc23c 100644
--- a/options/mzta-options.html
+++ b/options/mzta-options.html
@@ -266,7 +266,7 @@
           </label>
         </td>
       </tr>
-      <tr id="add_tags_tr">
+      <tr class="add_tags_tr">
         <td><span>__MSG_prefs_OptionText_add_tags__</span></td>
         <td>
           <label>
@@ -275,6 +275,15 @@
           </label>
         </td>
       </tr>
+      <tr class="add_tags_tr">
+        <td><span>__MSG_prefs_OptionText_add_tags_maxnum__</span></td>
+        <td>
+          <label>
+            <input type="number" id="add_tags_maxnum" name="add_tags_maxnum" class="option-input" />
+            <br>__MSG_prefs_OptionText_add_tags_maxnum_Info__
+          </label>
+        </td>
+      </tr>
       <tr>
         <td style="width:20em"><label>
           <span>__MSG_Debug__</span>
diff --git a/options/mzta-options.js b/options/mzta-options.js
index ea9fb930..a9f6dd74 100644
--- a/options/mzta-options.js
+++ b/options/mzta-options.js
@@ -215,10 +215,18 @@ function disable_MaxPromptLength(){
 
 function disable_AddTags(){
   let add_tags = document.getElementById('add_tags');
+  let add_tags_maxnum = document.getElementById('add_tags_maxnum');
   let conntype_select = document.getElementById("connection_type");
   add_tags.disabled = (conntype_select.value === "chatgpt_web");
-  let add_tags_tr = document.getElementById('add_tags_tr');
-  add_tags_tr.style.display = (add_tags.disabled) ? 'none' : 'table-row';
+  add_tags_maxnum.disabled = (conntype_select.value === "chatgpt_web");
+
+  // Seleziona tutti gli elementi con la classe 'add_tags_tr'
+  let add_tags_tr_elements = document.querySelectorAll('.add_tags_tr');
+
+  // Applica lo stile a tutti gli elementi con la classe
+  add_tags_tr_elements.forEach(add_tags_tr => {
+    add_tags_tr.style.display = (add_tags.disabled) ? 'none' : 'table-row';
+  });
 }
 
 document.addEventListener('DOMContentLoaded', async () => {