--- a/mobile/chrome/content/browser-ui.js
+++ b/mobile/chrome/content/browser-ui.js
@@ -1603,25 +1603,27 @@ var BookmarkHelper = {
     let top = toolbar.top + toolbar.boxObject.height;
 
     this._panel = document.getElementById("bookmark-container");
     this._panel.top = (top < 0 ? 0 : top);
     this._panel.hidden = false;
     BrowserUI.pushPopup(this, this._panel);
 
     let self = this;
+    BrowserUI.lockToolbar();
     Browser.forceChromeReflow();
     self._editor.startEditing();
   },
 
   save: function BH_save() {
     this._editor.stopEditing(true);
   },
 
   hide: function BH_hide() {
+    BrowserUI.unlockToolbar();
     BrowserUI.updateStar();
 
     // Note: the _editor will have already saved the data, if needed, by the time
     // this method is called, since this method is called via the "close" event.
     this._editor.parentNode.removeChild(this._editor);
     this._editor = null;
 
     this._panel.hidden = true;