diff --git a/extensions/sievefilters/templates/sievefilters/filter.html b/extensions/sievefilters/templates/sievefilters/filter.html
index 234583c10..065b1d425 100644
--- a/extensions/sievefilters/templates/sievefilters/filter.html
+++ b/extensions/sievefilters/templates/sievefilters/filter.html
@@ -77,11 +77,11 @@ $(document).addEvent("domready", function() {
       <div class="spacer"></div>
     </div>
     <div class="spacer"></div>
-    {% if hideconds %}<div id="hide" style="display:none">{% endif %}
-    {% for ec in conds_nb %}
-    {% display_condition form ec %}
-    {% endfor %}
-    {% if hideconds %}</div>{% endif %}
+    <div id="hide" style="display:{{ hidestyle }}">
+      {% for ec in conds_nb %}
+      {% display_condition form ec %}
+      {% endfor %}
+    </div>
   </div>
   <h2>{% trans "Actions" %}</h2>
   <div id="actionlist">
diff --git a/extensions/sievefilters/views.py b/extensions/sievefilters/views.py
index b8abcafed..b46533d1b 100644
--- a/extensions/sievefilters/views.py
+++ b/extensions/sievefilters/views.py
@@ -130,8 +130,8 @@ def editfilter(request, setname, fname, tplname="sievefilters/filter.html"):
     form = build_filter_form_from_filter(request, fname, f)
     ctx = build_filter_ctx(ctx, form)
     ctx["oldname"] = fname
-    if form.fields["match_type"].initial == "all":
-        ctx["hideconds"] = True
+    ctx["hidestyle"] = "none" \
+        if form.fields["match_type"].initial == "all" else "block"
     return _render(request, tplname, ctx)
 
 @login_required