diff --git a/chrome/content/zotero/components/tagSelector/tagSelectorList.jsx b/chrome/content/zotero/components/tagSelector/tagSelectorList.jsx
index d1fc291f50..80abffe398 100644
--- a/chrome/content/zotero/components/tagSelector/tagSelectorList.jsx
+++ b/chrome/content/zotero/components/tagSelector/tagSelectorList.jsx
@@ -97,7 +97,7 @@ class TagList extends React.PureComponent {
 	updatePositions() {
 		const tagPaddingTop = this.props.uiDensity === 'comfortable' ? 2 : 1;
 		const tagPaddingBottom = tagPaddingTop;
-		this.scrollbarWidth = Zotero.Utilities.Internal.getScrollbarWidth();
+		this.scrollbarWidth = Math.max(Zotero.Utilities.Internal.getScrollbarWidth(), 6);
 
 		var tagMaxWidth = this.props.width - minHorizontalPadding - this.scrollbarWidth;
 		var rowHeight = tagPaddingTop + this.props.lineHeight + tagPaddingBottom + tagSpaceBetweenY;
diff --git a/scss/components/_tagSelector.scss b/scss/components/_tagSelector.scss
index 48a3cf53ee..fd376dcdf4 100644
--- a/scss/components/_tagSelector.scss
+++ b/scss/components/_tagSelector.scss
@@ -47,6 +47,10 @@
 	margin: 0;
 	padding: 0;
 	scrollbar-color: var(--color-scrollbar) var(--color-scrollbar-background);
+
+	.ReactVirtualized__Collection__innerScrollContainer {
+		padding-bottom: 8px;
+	}
 }
 
 .tag-selector-filter-pane {