diff --git a/app/assets/stylesheets/components/message.scss b/app/assets/stylesheets/components/message.scss
index 2e9229e51..11b309e4a 100644
--- a/app/assets/stylesheets/components/message.scss
+++ b/app/assets/stylesheets/components/message.scss
@@ -108,17 +108,22 @@ a {
           }
         }
 
-        &:active,
-        &:focus {
+        &:focus,
+        &:active {
 
+          &,
           &::before {
             background-color: $govuk-focus-colour;
-            box-shadow: 0px -2px $govuk-focus-colour, 0px 4px $govuk-focus-text-colour;
           }
 
+          &,
           & + .template-list-item-hint,
           .message-type {
-            color: $govuk-text-colour;
+            color: $govuk-focus-text-colour;
+          }
+
+          &::before {
+            box-shadow: 0px -2px $govuk-focus-colour, 0px 4px $govuk-focus-text-colour;
           }
 
         }
@@ -177,7 +182,8 @@ a {
       background-image: file-url('folder-blue-bold-hover.svg');
     }
 
-    &:focus {
+    &:focus,
+    &:active {
       background-image: file-url('folder-black-bold.svg');
     }
 
diff --git a/app/assets/stylesheets/views/dashboard.scss b/app/assets/stylesheets/views/dashboard.scss
index 4e9f9be45..f97c98c39 100644
--- a/app/assets/stylesheets/views/dashboard.scss
+++ b/app/assets/stylesheets/views/dashboard.scss
@@ -68,6 +68,14 @@
     margin-top: -10px;
   }
 
+  &-filename-large-no-hint {
+    padding-bottom: 0;
+    padding-top: 5px;
+    margin-bottom: 0;
+    margin-top: 5px;
+    overflow: visible; // don't cut off thicker underline
+  }
+
   &-filename-unlinked {
     @include core-19;
   }
diff --git a/app/templates/views/broadcast/areas-with-sub-areas.html b/app/templates/views/broadcast/areas-with-sub-areas.html
index 594f15129..463c61555 100644
--- a/app/templates/views/broadcast/areas-with-sub-areas.html
+++ b/app/templates/views/broadcast/areas-with-sub-areas.html
@@ -25,7 +25,7 @@
 
   {% for area in library|sort %}
     <div class="file-list-item">
-      <a class="file-list-filename-large govuk-link govuk-link--no-visited-state" href="{{ url_for('.choose_broadcast_sub_area', service_id=current_service.id, broadcast_message_id=broadcast_message.id, library_slug=library.id, area_slug=area.id) }}">{{ area.name }}</a>
+      <a class="file-list-filename-large file-list-filename-large-no-hint govuk-link govuk-link--no-visited-state" href="{{ url_for('.choose_broadcast_sub_area', service_id=current_service.id, broadcast_message_id=broadcast_message.id, library_slug=library.id, area_slug=area.id) }}">{{ area.name }}</a>
     </div>
   {% endfor %}