diff --git a/blocks/search_forums/block_search_forums.php b/blocks/search_forums/block_search_forums.php
index 340a52eb6a0..3630c6dd5ab 100644
--- a/blocks/search_forums/block_search_forums.php
+++ b/blocks/search_forums/block_search_forums.php
@@ -26,19 +26,22 @@ class block_search_forums extends block_base {
 
         $advancedsearch = get_string('advancedsearch', 'block_search_forums');
 
+        $search = get_string('search');
+
         //Accessibility: replaced <input value=" />" type="submit"> with configurable text/'silent' character.
         check_theme_arrows();
         // Theme config, $CFG->block_search_button = $THEME->rarrow .'<span class="accesshide">'.get_string('search').'</span>';
         $button = (isset($CFG->block_search_button)) ? $CFG->block_search_button : get_string('go');
         
         $this->content->text  = '<div class="searchform">';
-        $this->content->text .= '<form action="'.$CFG->wwwroot.'/mod/forum/search.php" style="display:inline"><div>';
+        $this->content->text .= '<form action="'.$CFG->wwwroot.'/mod/forum/search.php" style="display:inline"><fieldset class="invisiblefieldset">';
         $this->content->text .= '<input name="id" type="hidden" value="'.$this->instance->pageid.'" />';  // course
-        $this->content->text .= '<input name="search" type="text" size="16" />';
-        $this->content->text .= '<button type="submit" title="'.get_string('search').'">'.$button.'</button><br />'; 
+        $this->content->text .= '<label class="accesshide" for="searchform_search">'.$search.'</label>'.
+                                '<input id="searchform_search" name="search" type="text" size="16" />';
+        $this->content->text .= '<button id="searchform_button" type="submit" title="'.$search.'">'.$button.'</button><br />'; 
         $this->content->text .= '<a href="'.$CFG->wwwroot.'/mod/forum/search.php?id='.$this->instance->pageid.'">'.$advancedsearch.'</a>';
         $this->content->text .= helpbutton('search', $advancedsearch, 'moodle', true, false, '', true);
-        $this->content->text .= '</div></form></div>';
+        $this->content->text .= '</fieldset></form></div>';
 
         return $this->content;
     }