diff --git a/calendar/templates/header.mustache b/calendar/templates/header.mustache
index 626470dfd98..c50e643a1a4 100644
--- a/calendar/templates/header.mustache
+++ b/calendar/templates/header.mustache
@@ -31,8 +31,9 @@
     {
     }
 }}
-{{#filter_selector}}
 <div class="header">
-    {{{filter_selector}}}
+    {{#filter_selector}}
+        {{{filter_selector}}}
+    {{/filter_selector}}
+    {{> core_calendar/add_event_button}}
 </div>
-{{/filter_selector}}
diff --git a/calendar/templates/month_detailed.mustache b/calendar/templates/month_detailed.mustache
index 8d1e49552ed..7eecac2a56a 100644
--- a/calendar/templates/month_detailed.mustache
+++ b/calendar/templates/month_detailed.mustache
@@ -39,7 +39,6 @@
     }} data-year="{{date.year}}"{{!
     }}>
     {{> core_calendar/header }}
-    {{> core_calendar/add_event_button}}
     {{> core_calendar/month_navigation }}
     {{> core/overlay_loading}}
     <table id="month-detailed-{{uniqid}}" class="calendarmonth calendartable card-deck m-b-0">