diff --git a/templates/flags/list.tpl b/templates/flags/list.tpl
index 16d5af4..3510650 100644
--- a/templates/flags/list.tpl
+++ b/templates/flags/list.tpl
@@ -7,13 +7,13 @@
 	<div class="col-sm-8 col-md-9">
 		<div class="text-center">
 			<div class="panel panel-default">
-				<div class="panel-body collapse" id="flags-daily-wrapper">
+				<div class="panel-body collapse" id="flags-daily-wrapper" aria-expanded="false">
 					<div><canvas id="flags:daily" height="250"></canvas></div>
 					<p>
 
 					</p>
 				</div>
-				<div class="panel-footer"><small>[[flags:graph-label]]</small>&nbsp;<span class="caret"></span></div>
+				<div class="panel-footer" aria-controls="#flags-daily-wrapper"><small>[[flags:graph-label]]</small>&nbsp;<span class="caret"></span></div>
 			</div>
 		</div>
 
diff --git a/templates/partials/flags/filters.tpl b/templates/partials/flags/filters.tpl
index d2e67e7..8a5a232 100644
--- a/templates/partials/flags/filters.tpl
+++ b/templates/partials/flags/filters.tpl
@@ -47,7 +47,7 @@
 				</div>
 			</fieldset>
 
-			<fieldset class="collapse" id="more-filters">
+			<fieldset class="collapse" id="more-filters" aria-expanded="false">
 				<div class="form-group">
 					<label for="filter-assignee">[[flags:filter-assignee]]</label>
 					<input type="number" class="form-control" id="filter-assignee" name="assignee" min="0" />
@@ -64,7 +64,7 @@
 				</div>
 			</fieldset>
 
-			<button type="button" class="btn btn-link btn-block" data-toggle="collapse" data-target="#more-filters">[[flags:more-filters]]&nbsp;<span class="caret"></span></button>
+			<button type="button" class="btn btn-link btn-block" data-toggle="collapse" data-target="#more-filters" aria-controls="#more-filters">[[flags:more-filters]]&nbsp;<span class="caret"></span></button>
 			<button type="button" id="apply-filters" class="btn btn-primary btn-block">[[flags:apply-filters]]</button>
 		</form>
 	</div>