diff --git a/CHANGELOG b/CHANGELOG
index 602d55305..aff783ad1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ CHANGELOG Roundcube Webmail
 ===========================
 
 - Managesieve: Replace "Filter disabled" with "Filter enabled" (#7028)
+- Managesieve: Fix so modifier type select wasn't hidden after hiding modifier select on header change
 - Enigma: Add script to import keys from filesystem to the db storage (for multihost)
 - Fix so type attribute on script tags is not used on HTML5 pages (#6975)
 - Fix unread count after purge on a folder that is not currently selected (#7051)
diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index ead1e742a..5e8657113 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -1,4 +1,5 @@
 - Replace "Filter disabled" with "Filter enabled" (#7028)
+- Fix so modifier type select wasn't hidden after hiding modifier select on header change
 
 * version 9.3 [2019-04-21]
 -----------------------------------------------------------
diff --git a/plugins/managesieve/managesieve.js b/plugins/managesieve/managesieve.js
index 4ced267e2..b8f71f6e8 100644
--- a/plugins/managesieve/managesieve.js
+++ b/plugins/managesieve/managesieve.js
@@ -679,7 +679,7 @@ function rule_header_select(id)
     rule.val('contains');
 
   rule_op_select(op, id, h);
-  rule_mod_select(id, h);
+  rule_mod_select(id, h, !is_header);
   rule_mime_select(id);
 
   obj.style.width = h == '...' ? '40px' : '';
@@ -703,13 +703,16 @@ function rule_trans_select(id)
   target.style.display = obj.value != 'content' ? 'none' : 'inline';
 };
 
-function rule_mod_select(id, header)
+function rule_mod_select(id, header, reset)
 {
   var obj = document.getElementById('rule_mod_op' + id),
     target = document.getElementById('rule_mod_type' + id),
     duplicate = document.getElementById('rule_duplicate_div' + id),
     index = document.getElementById('rule_index_div' + id);
 
+  if (reset)
+    obj.value = '';
+
   if (!header)
     header = document.getElementById('header' + id).value;