diff --git a/chrome/content/zotero/bindings/tagselector.xml b/chrome/content/zotero/bindings/tagselector.xml
index 8466d42c3..78f40cf41 100644
--- a/chrome/content/zotero/bindings/tagselector.xml
+++ b/chrome/content/zotero/bindings/tagselector.xml
@@ -25,8 +25,7 @@
 
 <bindings xmlns="http://www.mozilla.org/xbl"
 		  xmlns:xbl="http://www.mozilla.org/xbl"
-		  xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-		  xmlns:html="http://www.w3.org/1999/xhtml">
+		  xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<binding id="tag-selector">
 		<resources>
@@ -55,7 +54,7 @@
 				<parameter name="tags"/>
 				<body>
 					<![CDATA[
-						var tagsToggleDiv = this.id('tags-toggle').firstChild;
+						var tagsToggleDiv = this.id('tags-toggle');
 						
 						// Save selection
 						var labels = tagsToggleDiv.getElementsByTagName('label');
@@ -93,7 +92,7 @@
 			<method name="selectVisible">
 				<body>
 					<![CDATA[
-						var tagsToggleDiv = this.id('tags-toggle').firstChild;
+						var tagsToggleDiv = this.id('tags-toggle');
 						
 						var labels = tagsToggleDiv.getElementsByTagName('label');
 						for (var i=0; i<labels.length; i++){
@@ -109,7 +108,7 @@
 			<method name="clearVisible">
 				<body>
 					<![CDATA[
-						var tagsToggleDiv = this.id('tags-toggle').firstChild;
+						var tagsToggleDiv = this.id('tags-toggle');
 						
 						var labels = tagsToggleDiv.getElementsByTagName('label');
 						for (var i=0; i<labels.length; i++){
@@ -190,9 +189,7 @@
 		
 		<content>
 			<xul:groupbox flex="1">
-					<xul:vbox id="tags-toggle" flex="1">
-						<html:div/>
-					</xul:vbox>
+					<xul:vbox id="tags-toggle" flex="1"/>
 					<xul:hbox>
 						<xul:label value="&zotero.tagSelector.filter;"/>
 						<xul:textbox id="tags-search" flex="1" type="timed" timeout="250" dir="reverse"
diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul
index 8c95aa493..850e7756d 100644
--- a/chrome/content/zotero/overlay.xul
+++ b/chrome/content/zotero/overlay.xul
@@ -24,8 +24,7 @@
 <!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd">
 
 <overlay id="zotero"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	xmlns:html="http://www.w3.org/1999/xhtml">
+	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 	<?xul-overlay href="itemPane.xul" ?>
 	
     <!-- Include the global XPCOM object -->
diff --git a/chrome/skin/default/zotero/bindings/tagselector.css b/chrome/skin/default/zotero/bindings/tagselector.css
index 6b388b45e..30348fd70 100644
--- a/chrome/skin/default/zotero/bindings/tagselector.css
+++ b/chrome/skin/default/zotero/bindings/tagselector.css
@@ -7,24 +7,20 @@
 groupbox
 {
 	overflow: auto;
-	min-height: 153px;
+	min-height: 130px;
 }
 
-vbox
+#tags-toggle
 {
 	overflow: auto;
 	margin-bottom: 10px;
-}
-
-html|div
-{
-	position: relative;
+	display: block; /* allow labels to wrap instead of all being in one line */
 }
 
 label
 {
 	margin-right: 5px;
-	padding: 2px 5px;
+	padding: 2px 4px;
 }
 
 label[selected=true]
diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css
index added8ab9..815fc44e2 100644
--- a/chrome/skin/default/zotero/overlay.css
+++ b/chrome/skin/default/zotero/overlay.css
@@ -11,6 +11,7 @@
 	min-height: 170px;
 	height: 300px;
 	padding: 4px;
+	overflow: hidden;
 }
 
 #zotero-collections-pane
