diff --git a/lib/visualpatterns/NavBar.inc b/lib/visualpatterns/NavBar.inc
index e0d41fc..89cabed 100644
--- a/lib/visualpatterns/NavBar.inc
+++ b/lib/visualpatterns/NavBar.inc
@@ -259,7 +259,8 @@ class NavBar {
         if ((strcmp($this->sSection,"Standard Search") == 0) || (strcmp($this->sSection,"Advanced Search") == 0)) {
             $bar .= "<INPUT type=\"hidden\" name=\"fSearchText\"/>\n ";
         } else {
-            $bar .= "<INPUT type=\"text\" name=\"fSearchText\" width=\"30\" height = \"10\" />\n";
+            $bar .= "<INPUT type=\"text\" name=\"fSearchText\" width=\"30\" height = \"10\" onKeyPress=\"checkKeyPressed(event,
+validateStandardSearch, '" . $default->rootUrl . "/control.php')\"/>\n";
             (isset($this->iFolderID) ? $bar .= "<INPUT type=\"hidden\" name=\"fFolderID\" value=\"" . $this->iFolderID . "\"  />\n " : $bar .= "");
             (isset($this->iDocumentID) ? $bar .= "<INPUT type=\"hidden\" name=\"fDocumentID\" value=\"" . $this->iDocumentID . "\"  />\n " : $bar .= "");
             (isset($this->sCategoryName) ? $bar .= "<INPUT type=\"hidden\" name=\"fCategoryName\" value=\"" . $this->sCategoryName . "\"  />\n " : $bar .= "");
@@ -288,6 +289,21 @@ class NavBar {
     function getSearchValidationJavaScript() {
         $sToRender = "\n\n<SCRIPT LANGUAGE=\"javascript\">\n ";
         $sToRender .= "<!--\n";
+
+        $sToRender .= '
+// From http://www.severnsolutions.co.uk/twblog/archive/2003/09/14/keypressevents
+function checkKeyPressed(evt, func, params)
+{
+  evt = (evt) ? evt : (window.event) ? event : null;
+  if (evt)
+  {
+    var charCode = (evt.charCode) ? evt.charCode :
+                   ((evt.keyCode) ? evt.keyCode :
+                   ((evt.which) ? evt.which : 0));
+    if (charCode == 13) func(params);
+  }    
+}';
+
         $sToRender .= "function validateStandardSearch(newAction) {\n";        
         $sToRender .= "\tif (!(validRequired(document.MainForm.fSearchText, 'Search text'))) {\n";
         $sToRender .= "\t\treturn false;\n\t}\n";