--- a/mobile/chrome/content/browser-ui.js
+++ b/mobile/chrome/content/browser-ui.js
@@ -400,17 +400,17 @@ var BrowserUI = {
 
   init : function() {
     this._edit = document.getElementById("urlbar-edit");
     this._throbber = document.getElementById("urlbar-throbber");
     this._favicon = document.getElementById("urlbar-favicon");
     this._favicon.addEventListener("error", this, false);
 
     let urlbarEditArea = document.getElementById("urlbar-editarea");
-    urlbarEditArea.addEventListener("mouseup", this, false);
+    urlbarEditArea.addEventListener("click", this, false);
     urlbarEditArea.addEventListener("mousedown", this, false);
 
     document.getElementById("toolbar-main").ignoreDrag = true;
 
     let tabs = document.getElementById("tabs");
     tabs.addEventListener("TabSelect", this, true);
     tabs.addEventListener("TabOpen", this, true);
 
@@ -758,20 +758,18 @@ var BrowserUI = {
           case "Search":
             this.doCommand("cmd_openLocation");
             break;
           default:
             break;
         }
         break;
       // URL textbox events
-      case "mouseup":
-        if (aEvent.detail < 2 && aEvent.button == 0 && gFocusManager.focusedElement == this._edit.inputField) {
-          this.doCommand("cmd_openLocation");
-        }
+      case "click":
+        this.doCommand("cmd_openLocation");
         break;
       case "mousedown":
         if (!this._isEventInsidePopup(aEvent))
           this._hidePopup();
 
         let selectAll = gPrefService.getBoolPref("browser.urlbar.doubleClickSelectsAll");
         if (aEvent.detail == 2 && aEvent.button == 0 && selectAll && aEvent.target == this._edit) {
           this._edit.editor.selectAll();