diff --git a/mod/wiki/lib.php b/mod/wiki/lib.php
index 079629bd583..0c00bca7272 100644
--- a/mod/wiki/lib.php
+++ b/mod/wiki/lib.php
@@ -920,12 +920,12 @@ function wiki_print_search_form($cmid, $search="", $userid, $groupid, $return=fa
     global $CFG;
     # TODO: Add Group and User !!!
     $output = "<form name=\"search\" action=\"$CFG->wwwroot/mod/wiki/view.php\">";
-    $output .= "<font size=\"-1\">".get_string("search").': ';
+    $output .= "<font size=\"-1\">";
+    $output .= "<input value=\"".get_string("searchwiki", "wiki").":\" type=\"submit\">";
     $output .= "<input name=\"id\" type=\"hidden\" value=\"$cmid\">";
     $output = $output.($groupid?"<input name=\"groupid\" type=\"hidden\" value=\"$groupid\">":"");
     $output = $output.($userid?"<input name=\"userid\" type=\"hidden\" value=\"$userid\">":"");
     $output .= "<input name=\"q\" type=\"text\" size=\"20\" value=\"$search\">".' ';
-    $output .= "<input value=\"".get_string("searchwiki", "wiki")."\" type=\"submit\">";
     $output .= "</font>";
     $output .= "<input name=\"wikipage\" type=\"hidden\" value=\"SearchPages\">";
     $output .= "</form>";
@@ -1411,4 +1411,4 @@ function wiki_admin_revert($proceed, $authorfieldpattern, $changesfield, $howtoo
   } #-- while($row)
   return $ret;
 }
-?>
\ No newline at end of file
+?>
diff --git a/mod/wiki/view.php b/mod/wiki/view.php
index eeba07a07e1..a7105e57d6d 100644
--- a/mod/wiki/view.php
+++ b/mod/wiki/view.php
@@ -263,7 +263,7 @@
         echo '<tr>';
         
         /// Searchform
-        echo '<td align="left">';    
+        echo '<td align="center">';    
         wiki_print_search_form($cm->id, $q, $userid, $groupid, false);
         echo '</td>';
     
@@ -280,9 +280,8 @@
         }
         
         /// Formatting Rules
-        echo '<td align="center">';          
+        echo '<td align="right">';          
         helpbutton('howtowiki', get_string('howtowiki', 'wiki'), 'wiki');
-        echo get_string('howtowiki','wiki');
         echo '</td>';
         
         echo '</tr></table>';