diff --git a/chrome/content/zotero/integration/quickFormat.js b/chrome/content/zotero/integration/quickFormat.js
index 96629933be..2ec1d69969 100644
--- a/chrome/content/zotero/integration/quickFormat.js
+++ b/chrome/content/zotero/integration/quickFormat.js
@@ -629,6 +629,7 @@ var Zotero_QuickFormat = new function () {
 	this.onKeyPress = function(event) {
 		var keyCode = event.keyCode;
 		if(keyCode === event.DOM_VK_ESCAPE) {
+			io.citation.citationItems = [];
 			window.close();
 		}
 	}
diff --git a/chrome/skin/default/zotero/integration.css b/chrome/skin/default/zotero/integration.css
index 8873ee311e..1b58d214d5 100644
--- a/chrome/skin/default/zotero/integration.css
+++ b/chrome/skin/default/zotero/integration.css
@@ -88,6 +88,7 @@
 
 #editor {
 	margin-top: 10px;
+	max-height: 100px;
 }
 
 .quick-format-title {
@@ -134,6 +135,10 @@
 	padding-bottom: 0;
 }
 
+#quick-format-iframe {
+	height: 9999px;
+}
+
 body {
 	margin: 0 2px 0 2px;
 	padding: 0;