diff --git a/conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html b/conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html
index 342b56d9..822ee2f8 100644
--- a/conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html
+++ b/conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html
@@ -1,16 +1,16 @@
 {% load humanize %}
 
-{% if sitefundgoal1.days_remaining >= -22 %}{# i.e. 7 days over completion #}
+{% if sitefundgoal1.days_remaining >= -22 or sitefundgoal0.days_remaining >= -22  %}{# i.e. 7 days over completion #}
   <div class="fundraiser-top-text ph3 pt2 pb3 mb2 mb3-ns">
     <div class="mw8 center ph2 ph4-ns">
       <div class="mt2 mb3 tc">
-        {% if sitefundgoal1.days_remaining >= 0 %}
-          {% if sitefundgoal0.match_remaining <= 0 %}
+        {% if sitefundgoal0.match_remaining <= 0 %}
+          {% if sitefundgoal1.days_remaining >= 0 %}
                 {% if sitefundgoal1.match_remaining <= 0 %}
                           Thanks to so many donors, we earned our full original match donation &mdash; <em>as well as</em> our <strong>extended</strong> match!
                           Help us go further to stand up for software freedom &mdash; <a href="/sustainer">sign up now</a>!
                 {% else %}
-                     Thanks to so many donors, we met <em>our largest match donation ever of <strong>$211,939 </strong>.
+                     Thanks to so many donors, we met <em>our largest match donation ever of <strong>$211,939</strong>.
                      A generous anonymous donor has provided <em>another $40,000</em> of matching funds. 
                      <a href="https://sfconservancy.org/sustainer/">Give now to help us</a> reach this stretch goal!<br/>
                 {% endif %}