--- a/mobile/android/modules/NetErrorHelper.jsm
+++ b/mobile/android/modules/NetErrorHelper.jsm
@@ -6,16 +6,18 @@
 const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Messaging.jsm");
 Cu.import("resource://gre/modules/UITelemetry.jsm");
 
 this.EXPORTED_SYMBOLS = ["NetErrorHelper"];
 
+const KEY_CODE_ENTER = 13;
+
 /* Handlers is a list of objects that will be notified when an error page is shown
  * or when an event occurs on the page that they are registered to handle. Registration
  * is done by just adding yourself to the dictionary.
  *
  * handlers.myKey = {
  *   onPageShown: function(browser) { },
  *   handleEvent: function(event) { },
  * }
@@ -73,22 +75,31 @@ handlers.searchbutton = {
     let tab = browserWin.BrowserApp.getTabForBrowser(browser);
 
     // If there is no stored userRequested, just hide the searchbox
     if (!tab.userRequested) {
       search.style.display = "none";
     } else {
       let text = browser.contentDocument.querySelector("#searchtext");
       text.value = tab.userRequested;
+      text.addEventListener("keypress", (event) => {
+        if (event.keyCode === KEY_CODE_ENTER) {
+          this.doSearch(event.target.value);
+        }
+      });
     }
   },
 
   handleClick: function(event) {
+    let value = event.target.previousElementSibling.value;
+    this.doSearch(value);
+  },
+
+  doSearch: function(value) {
     let engine = Services.search.defaultEngine;
-    let value = event.target.previousElementSibling.value;
     let uri = engine.getSubmission(value).uri;
 
     let browserWin = Services.wm.getMostRecentWindow("navigator:browser");
     // Reset the user search to whatever the new search term was
     browserWin.BrowserApp.loadURI(uri.spec, undefined, { isSearch: true, userRequested: value });
   }
 };