diff --git a/fmn/web/templates/context.html b/fmn/web/templates/context.html
index d94b002..f225576 100644
--- a/fmn/web/templates/context.html
+++ b/fmn/web/templates/context.html
@@ -105,17 +105,18 @@ <h4 class="list-group-item-heading">{{fltr.name}}</h4>
           <input name="context" id="context" value="{{current}}" type="hidden">
           <input name="filter_name" id="filter_name" value="{{fltr.name}}" type="hidden">
           <span class="pull-right">
+            {% if fltr.oneshot %}
+              <button type="submit" name="method" value="disable-oneshot"
+              class="btn btn-primary" data-toggle="tooltip" title="One-shot
+              filters fire only once and then automatically disable
+              themselves.  You can use this feature to watch for a single
+              build, or a single comment somewhere.  This is currently a
+              one-shot filter.">
+                <span class="glyphicon glyphicon-star-empty"></span>
+                Disable one-shot</button>
+            {% endif %}
             {% if fltr.active %}
-              {% if fltr.oneshot %}
-                <button type="submit" name="method" value="disable-oneshot"
-                class="btn btn-primary" data-toggle="tooltip" title="One-shot
-                filters fire only once and then automatically disable
-                themselves.  You can use this feature to watch for a single
-                build, or a single comment somewhere.  This is currently a
-                one-shot filter.">
-                  <span class="glyphicon glyphicon-star-empty"></span>
-                  Disable one-shot</button>
-              {% else %}
+              {% if not fltr.oneshot %}
                 <button type="submit" name="method" value="enable-oneshot"
                 class="btn btn-info" data-toggle="tooltip" title="One-shot
                 filters fire only once and then automatically disable
diff --git a/fmn/web/templates/filter.html b/fmn/web/templates/filter.html
index b197c60..a72b612 100644
--- a/fmn/web/templates/filter.html
+++ b/fmn/web/templates/filter.html
@@ -35,15 +35,16 @@ <h3>sent to {{current}}</h3>
         </span>
 
         <span>
+        {% if filter.oneshot %}
+          <button type="submit" class="btn btn-primary" name="method"
+            value="disable-oneshot" data-toggle="tooltip" title="One-shot
+            filters fire only once and then automatically disable themselves.
+            You can use this feature to watch for a single build, or a single
+            comment somewhere.  This is currently a one-shot filter.">
+            <span class="glyphicon glyphicon-star-empty"></span>Disable one-shot</button>
+        {% endif %}
         {% if filter.active %}
-          {% if filter.oneshot %}
-            <button type="submit" class="btn btn-primary" name="method"
-              value="disable-oneshot" data-toggle="tooltip" title="One-shot
-              filters fire only once and then automatically disable themselves.
-              You can use this feature to watch for a single build, or a single
-              comment somewhere.  This is currently a one-shot filter.">
-              <span class="glyphicon glyphicon-star-empty"></span>Disable one-shot</button>
-          {% else %}
+          {% if not filter.oneshot %}
             <button type="submit" class="btn btn-info" name="method"
               value="enable-oneshot" data-toggle="tooltip" title="One-shot
               filters fire only once and then automatically disable themselves.