diff --git a/app/views/discussion_topics/show.html.erb b/app/views/discussion_topics/show.html.erb
index 71225857b07..1c2de403246 100644
--- a/app/views/discussion_topics/show.html.erb
+++ b/app/views/discussion_topics/show.html.erb
@@ -243,19 +243,19 @@
         <div class="headerBar" data-sticky>
           <div class="row-fluid form-inline" style="overflow: visible;">
             <div class="span9">
-              <label id="discussion-search-label" class="screenreader-only" for="discussion-search"><%= t("search_entries_placeholder", "Search entries or author") %></label>
               <input
                 id               = "discussion-search"
                 type             = "text"
-                aria-labelledby  = "discussion-search-label"
-                placeholder      = "<%= t("search_entries_placeholder", "Search entries or author") %>"
+                aria-label       = "<%= t("Search entries or author") %>"
+                placeholder      = "<%= t("Search entries or author") %>"
                 size             = 50
               >
 
               <input
                 type    = "checkbox"
                 id      = "onlyUnread"
-              ><label for="onlyUnread"><%= t('unread', 'Unread') %></label>
+                aria-label = "<%= t("filter replies by unread") %>"
+              ><label aria-hidden="true" for="onlyUnread"><%= t('unread', 'Unread') %></label>
 
               &nbsp; &nbsp;
               <button id="collapseAll" class="btn disableWhileFiltering" title="<%= t('collapse_replies', 'Collapse replies') %>" aria-label="<%= t('collapse_replies', 'Collapse replies') %>">
diff --git a/app/views/jst/DiscussionTopics/IndexView.handlebars b/app/views/jst/DiscussionTopics/IndexView.handlebars
index ff8e7c47a43..aad1610b274 100644
--- a/app/views/jst/DiscussionTopics/IndexView.handlebars
+++ b/app/views/jst/DiscussionTopics/IndexView.handlebars
@@ -41,18 +41,20 @@
       </button>
     </div>
     <div class="headerBar-left form-inline index_view_filter_form">
-      <label class="hidden-inline-text" for="searchTerm">{{#t "search_title_body_or_author"}}Search title, body, or author{{/t}}</label>
       <input id="searchTerm"
-             placeholder="{{#t "search_title_body_or_author"}}Search title, body, or author{{/t}}"
+             placeholder="{{t "Search title, body, or author"}}"
+             aria-label="{{t "Search title, body, or author"}}"
              value="{{searchTerm}}"
              type="search">
       <span id="discussionsFilter">
         <input type="checkbox"
                id="onlyUnread"
-               {{#if onlyUnread}}checked{{/if}} /><label for="onlyUnread">{{#t "unread"}}Unread{{/t}}</label>
+               aria-label="{{t "filter discussions by unread"}}"
+               {{#if onlyUnread}}checked{{/if}} /><label aria-hidden="true" for="onlyUnread">{{#t "unread"}}Unread{{/t}}</label>
         <input type="checkbox"
                id="onlyGraded"
-               {{#if onlyGraded}}checked{{/if}}/><label for="onlyGraded">{{#t "assignments"}}Assignments{{/t}}</label>
+               aria-label="{{t "filter discussions by assignments"}}"
+               {{#if onlyGraded}}checked{{/if}}/><label aria-hidden="true" for="onlyGraded">{{#t "assignments"}}Assignments{{/t}}</label>
       </span>
     </div>
   </div>
diff --git a/app/views/jst/announcements/IndexView.handlebars b/app/views/jst/announcements/IndexView.handlebars
index e60a8b30f84..09557651a75 100644
--- a/app/views/jst/announcements/IndexView.handlebars
+++ b/app/views/jst/announcements/IndexView.handlebars
@@ -25,15 +25,16 @@
       {{/if}}
     </div>
     <div class="headerBar-left form-inline index_view_filter_form">
-      <label class="hidden-inline-text" for="searchTerm">{{#t "search_title_body_or_author"}}Search title, body, or author{{/t}}</label>
       <input id="searchTerm"
-             placeholder="{{#t "search_title_body_or_author"}}Search title, body, or author{{/t}}"
+             placeholder="{{t "Search title, body, or author"}}"
+             aria-label="{{t "Search title, body, or author"}}"
              value="{{searchTerm}}"
              type="search">
       <span id="discussionsFilter">
         <input type="checkbox"
                id="onlyUnread"
-               {{#if onlyUnread}}checked{{/if}} /><label for="onlyUnread">{{#t "unread"}}Unread{{/t}}</label>
+               aria-label="{{t "filter announcements by unread"}}"
+               {{#if onlyUnread}}checked{{/if}} /><label aria-hidden="true" for="onlyUnread">{{#t "unread"}}Unread{{/t}}</label>
       </span>
     </div>
   </div>