diff --git a/chrome/content/zotero/integration/quickFormat.js b/chrome/content/zotero/integration/quickFormat.js
index 78c1c787b..d9a9070cd 100644
--- a/chrome/content/zotero/integration/quickFormat.js
+++ b/chrome/content/zotero/integration/quickFormat.js
@@ -730,12 +730,10 @@ var Zotero_QuickFormat = new function () {
 			}
 		}
 		
-		var qfeHeight = qfe.scrollHeight;
-		
-		if(qfeHeight > 30) {
+		if(qfe.scrollHeight > 30) {
 			qfe.setAttribute("multiline", true);
 			qfs.setAttribute("multiline", true);
-			qfs.style.height = (4+qfeHeight)+"px";
+			qfs.style.height = (4+qfe.scrollHeight)+"px";
 			window.sizeToContent();
 		} else {
 			delete qfs.style.height;
diff --git a/chrome/skin/default/zotero/integration.css b/chrome/skin/default/zotero/integration.css
index 10d32a5f2..9328e6e67 100644
--- a/chrome/skin/default/zotero/integration.css
+++ b/chrome/skin/default/zotero/integration.css
@@ -114,6 +114,9 @@
 	border-color: #a8c0ec;
 	padding: 0 6px 0 6px;
 	margin: -1px 2px 0 2px;
+	display: inline-block;
+	white-space: nowrap;
+	line-height: normal;
 	-moz-user-select: all;
 }