diff --git a/chrome/content/zotero/components/itemPane/tagsBox.jsx b/chrome/content/zotero/components/itemPane/tagsBox.jsx
index 0d5ae12a47..9dd7d3dbef 100644
--- a/chrome/content/zotero/components/itemPane/tagsBox.jsx
+++ b/chrome/content/zotero/components/itemPane/tagsBox.jsx
@@ -410,13 +410,15 @@ const TagsBox = React.forwardRef((props, ref) => {
 				<div className="tags-box-count">{renderCount()}</div>
 				<div><button onClick={handleAddTag}>Add</button></div>
 			</div>
-			<ul className="tags-box-list">
-				{displayTags.map(tag => renderTagRow(tag))}
-			</ul>
-			<span
-				tabIndex="0"
-				onFocus={handleAddTag}
-			/>
+			<div className="tags-box-list-container">
+				<ul className="tags-box-list">
+					{displayTags.map(tag => renderTagRow(tag))}
+				</ul>
+				<span
+					tabIndex="0"
+					onFocus={handleAddTag}
+				/>
+			</div>
 		</div>
 	);
 });
diff --git a/chrome/content/zotero/itemPane.js b/chrome/content/zotero/itemPane.js
index bd0eb09b3b..d21d4d12e0 100644
--- a/chrome/content/zotero/itemPane.js
+++ b/chrome/content/zotero/itemPane.js
@@ -190,7 +190,8 @@ var ZoteroItemPane = new function() {
 					ref={_tagsBox}
 					onResetSelection={focusItemsList}
 				/>,
-				document.getElementById('tags-box-container')
+				document.getElementById('tags-box-container'),
+				() => ZoteroPane.updateTagsBoxSize()
 			);
 		}
 		
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index 0879ca1631..3d213703ae 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -105,6 +105,7 @@ var ZoteroPane = new function()
 		window.addEventListener("resize", () => {
 			this.updateWindow();
 			this.updateToolbarPosition();
+			this.updateTagsBoxSize();
 		});
 		window.setTimeout(this.updateToolbarPosition.bind(this), 0);
 		
@@ -4904,6 +4905,7 @@ var ZoteroPane = new function()
 		}
 
 		this.updateToolbarPosition();
+		this.updateTagsBoxSize();
 	}
 	
 	
@@ -5024,6 +5026,25 @@ var ZoteroPane = new function()
 		this.handleTagSelectorResize();
 	}
 	
+	/**
+	 * Set an explicit height on the tags list to show a scroll bar if necessary
+	 *
+	 * This really should be be possible via CSS alone, but I couldn't get it to work, either
+	 * because I was doing something wrong or because the XUL layout engine was messing with me.
+	 * Revisit when we're all HTML.
+	 */
+	this.updateTagsBoxSize = function () {
+		var pane = document.querySelector('#zotero-item-pane');
+		var header = document.querySelector('#zotero-item-pane .tags-box-header');
+		var list = document.querySelector('#zotero-item-pane .tags-box-list');
+		if (pane && header && list) {
+			let height = pane.getBoundingClientRect().height
+				- header.getBoundingClientRect().height
+				- 35; // a little padding
+			list.style.height = height + 'px';
+		}
+	};
+	
 	/**
 	 * Opens the about dialog
 	 */
diff --git a/chrome/content/zotero/zoteroPane.xul b/chrome/content/zotero/zoteroPane.xul
index 3163e38658..141059d2b7 100644
--- a/chrome/content/zotero/zoteroPane.xul
+++ b/chrome/content/zotero/zoteroPane.xul
@@ -551,8 +551,8 @@
 					</vbox>
 
 					<splitter id="zotero-items-splitter" resizebefore="closest" resizeafter="closest" collapse="after" orient="horizontal" zotero-persist="state orient"
-						onmousemove="ZoteroPane_Local.updateToolbarPosition()"
-						oncommand="ZoteroPane_Local.updateToolbarPosition()">
+						onmousemove="ZoteroPane.updateToolbarPosition(); ZoteroPane.updateTagsBoxSize()"
+						oncommand="ZoteroPane.updateToolbarPosition(); ZoteroPane.updateTagsBoxSize()">
 						<grippy id="zotero-items-grippy"/>
 					</splitter>
 
diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css
index 7f43c63e80..36da660ceb 100644
--- a/chrome/skin/default/zotero/overlay.css
+++ b/chrome/skin/default/zotero/overlay.css
@@ -288,6 +288,7 @@
 {
 	width: 338px;
 	min-width: 338px;
+	overflow-y: hidden;
 }
 
 #zotero-layout-switcher
diff --git a/scss/components/_editable.scss b/scss/components/_editable.scss
index 1c3ffaf18f..af75d0bcef 100644
--- a/scss/components/_editable.scss
+++ b/scss/components/_editable.scss
@@ -7,4 +7,11 @@ input.editable-control {
 textarea.editable-control {
 	font-family: inherit;
 	font-size: inherit;
+}
+
+.editable-content {
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	width: 100%;
 }
\ No newline at end of file
diff --git a/scss/components/_tagsBox.scss b/scss/components/_tagsBox.scss
index 545bf2d529..a3722ea52c 100644
--- a/scss/components/_tagsBox.scss
+++ b/scss/components/_tagsBox.scss
@@ -8,7 +8,13 @@
 }
 
 .tags-box {
+	$item-pane-width: 330px;
+	$icon-width: 16px;
+	$delete-button-width: 20px;
+	$li-side-margin: 6px;
+	
 	flex-grow: 1;
+	width: 330px;
 	
 	.tags-box-header {
 		display: flex;
@@ -32,12 +38,13 @@
 	ul.tags-box-list {
 		list-style: none;
 		margin: 0;
-		padding: 0;
+		padding: 2px 0 0; // Leave space for textbox border on top tag
+		overflow-y: auto;
 	}
 	
 	ul.tags-box-list > li {
 		display: flex;
-		margin: 3px 6px 3px 6px;
+		margin: 3px $li-side-margin;
 		align-items: center;
 		height: 1.5em;
 		
@@ -45,7 +52,7 @@
 			border: 0;
 			background: none;
 			padding: 0;
-			width: 20px;
+			width: $delete-button-width;
 			height: 18px;
 		}
 	}
@@ -53,6 +60,7 @@
 	.editable-container {
 		flex-grow: 1;
 		margin: 0 2px;
+		width: $item-pane-width - $icon-width - $delete-button-width - ($li-side-margin * 2);
 	}
 	
 	ul.tags-box-list > li:not(.multiline) .editable-container {