diff --git a/chrome/content/zotero/lookup.js b/chrome/content/zotero/lookup.js
index 4df73e88e4..31cd984149 100644
--- a/chrome/content/zotero/lookup.js
+++ b/chrome/content/zotero/lookup.js
@@ -146,7 +146,6 @@ var Zotero_Lookup = new function () {
 		if (event.originalTarget.id != 'zotero-lookup-panel') return;
 		
 		document.getElementById("zotero-lookup-panel").style.padding = "10px";
-		this.getActivePanel().getElementsByTagName('textbox')[0].focus();
 		
 		// Resize arrow box to fit content
 		if (Zotero.isMac) {
@@ -157,6 +156,17 @@ var Zotero_Lookup = new function () {
 	}
 	
 	
+	/**
+	 * Focuses the field
+	 */
+	this.onShown = function (event) {
+		// Ignore context menu
+		if (event.originalTarget.id != 'zotero-lookup-panel') return;
+		
+		this.getActivePanel().querySelector('input').focus();
+	}
+	
+	
 	/**
 	 * Cancels the popup and resets fields
 	 */
@@ -175,11 +185,21 @@ var Zotero_Lookup = new function () {
 	
 	this.getActivePanel = function() {
 		var mlPanel = document.getElementById("zotero-lookup-multiline");
-		if (mlPanel.collapsed) return document.getElementById("zotero-lookup-singleLine");
+		if (mlPanel.hidden) return document.getElementById("zotero-lookup-singleLine");
 		return mlPanel;
 	}
 	
 	
+	this.handleToolbarButtonMouseDown = function (event) {
+		var button = event.target;
+		if (button.disabled) {
+			event.preventDefault();
+			return;
+		}
+		this.showPanel(button)
+	};
+	
+	
 	/**
 	 * Handles a key press
 	 */
diff --git a/chrome/content/zotero/zoteroPane.xhtml b/chrome/content/zotero/zoteroPane.xhtml
index 6740472182..9a91739e06 100644
--- a/chrome/content/zotero/zoteroPane.xhtml
+++ b/chrome/content/zotero/zoteroPane.xhtml
@@ -731,28 +731,31 @@
 									<toolbarbutton id="zotero-tb-lookup" class="zotero-tb-button" tooltiptext="&zotero.toolbar.lookup.label;" type="panel"
 											onmousedown="if (this.disabled) { event.preventDefault(); return; } Zotero_Lookup.showPanel(this)"/>
 									
-									<panel id="zotero-lookup-panel" type="arrow" onpopupshown="Zotero_Lookup.onShowing(event)"
-											onpopuphidden="Zotero_Lookup.onHidden(event)">
-										<vbox>
-											<description>&zotero.lookup.description;</description>
-											<vbox id="zotero-lookup-singleLine">
+									<panel id="zotero-lookup-panel" type="arrow"
+											onpopupshowing="Zotero_Lookup.onShowing(event)"
+											onpopupshown="Zotero_Lookup.onShown(event)"
+											onpopuphidden="Zotero_Lookup.onHidden(event)"
+									>
+										<html:div>
+											<html:label>&zotero.lookup.description;</html:label>
+											<html:div id="zotero-lookup-singleLine">
 												<stack>
 													<progressmeter id="zotero-lookup-progress" mode="determined"/>
-													<textbox id="zotero-lookup-textbox"
+													<html:input id="zotero-lookup-textbox"
 														onkeypress="return Zotero_Lookup.onKeyPress(event, this)"
-														oninput="Zotero_Lookup.onInput(event, this)"
-														flex="1"
-														newlines="pasteintact"/>
+														oninput="Zotero_Lookup.onInput(event, this)"/>
 												</stack>
-											</vbox>
-											<vbox id="zotero-lookup-multiline" collapsed="true">
-												<textbox id="zotero-lookup-multiline-textbox" onkeypress="return Zotero_Lookup.onKeyPress(event, this)" multiline="true" rows="5" wrap="off" flex="1"/>
-												<hbox align="start" id="zotero-lookup-buttons" class="zotero-button-clear-image">
-													<button label="&zotero.lookup.button.search;" align="start" oncommand="Zotero_Lookup.accept(document.getElementById('zotero-lookup-multiline-textbox'))"/>
+											</html:div>
+											<html:div id="zotero-lookup-multiline" hidden="">
+												<html:input id="zotero-lookup-multiline-textbox" onkeypress="return Zotero_Lookup.onKeyPress(event, this)" rows="5"/> <!-- wrap="off" flex="1"/> -->
+												<html:div id="zotero-lookup-buttons" class="zotero-button-clear-image"> <!-- align="start"  -->
+													<html:button align="start" onclick="Zotero_Lookup.accept(document.getElementById('zotero-lookup-multiline-textbox'))">
+														&zotero.lookup.button.search;
+													</html:button>
 													<progressmeter id="zotero-lookup-multiline-progress" mode="determined" flex="1" hidden="true"/>
-												</hbox>
-											</vbox>
-										</vbox>
+												</html:div>
+											</html:div>
+										</html:div>
 									</panel>
 									
 									<!--<toolbarbutton id="zotero-tb-note-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.note.standalone;" oncommand="ZoteroPane_Local.newNote(event.shiftKey);"/>-->
diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css
index 314b18c73a..03dd5147d8 100644
--- a/chrome/skin/default/zotero/overlay.css
+++ b/chrome/skin/default/zotero/overlay.css
@@ -301,6 +301,11 @@
 	list-style-image: url('chrome://zotero/skin/toolbar-item-from-page.png');
 }
 
+#zotero-lookup-multiline-progress
+{
+	height: 2em;
+}
+
 /*
 #zotero-tb-link-page
 {