diff --git a/chrome/content/zotero/integration/addCitationDialog.xhtml b/chrome/content/zotero/integration/addCitationDialog.xhtml
index e8c440938a..a1e41995a2 100644
--- a/chrome/content/zotero/integration/addCitationDialog.xhtml
+++ b/chrome/content/zotero/integration/addCitationDialog.xhtml
@@ -70,11 +70,11 @@
 						<quick-search-textbox id="zotero-tb-search" timeout="250" oncommand="onSearch()" dir="reverse"/>
 					</hbox>
 					<hbox flex="1" style="margin-top: 5px">
-						<vbox id="zotero-collections-tree-container" class="virtualized-table-container" style="min-width: 200px">
+						<vbox id="zotero-collections-tree-container" class="virtualized-table-container" style="min-width: 200px; min-height: 100%;">
 							<html:div id="zotero-collections-tree"></html:div>
 						</vbox>
 
-						<hbox id="zotero-items-pane-content" class="virtualized-table-container" flex="1">
+						<hbox id="zotero-items-pane-content" class="virtualized-table-container" flex="1" style="width: 100%; min-height: 100%;">
 							<html:div id="zotero-items-tree"></html:div>
 						</hbox>
 					</hbox>
diff --git a/chrome/content/zotero/integration/simpleEditor.js b/chrome/content/zotero/integration/simpleEditor.js
index da2f3746b6..e628deec5f 100644
--- a/chrome/content/zotero/integration/simpleEditor.js
+++ b/chrome/content/zotero/integration/simpleEditor.js
@@ -48,9 +48,7 @@
 // Simple WYSIWYG editor using contenteditable
 
 (function() {
-var Zotero = Components.classes['@zotero.org/Zotero;1']
-	.getService(Components.interfaces.nsISupports)
-	.wrappedJSObject;
+var { Zotero } = ChromeUtils.importESModule("chrome://zotero/content/zotero.mjs");
 	
 const defaultParagraphSeparatorString = 'defaultParagraphSeparator'
 const formatBlock = 'formatBlock'