diff --git a/chrome/content/zotero/collectionTree.jsx b/chrome/content/zotero/collectionTree.jsx
index f52e02af84..add1544a4b 100644
--- a/chrome/content/zotero/collectionTree.jsx
+++ b/chrome/content/zotero/collectionTree.jsx
@@ -373,6 +373,7 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 			label = document.createElement('input');
 			label.className = 'cell-text';
 			label.setAttribute("size", 5);
+			label.toggleAttribute("no-windows-native", true);
 			label.value = treeRow.editingName;
 			label.addEventListener('input', e => this.handleEditingChange(e, index));
 			label.addEventListener('mousedown', (e) => e.stopImmediatePropagation());
diff --git a/scss/components/_collection-tree.scss b/scss/components/_collection-tree.scss
index ac6e89b57d..d4ccf04a45 100644
--- a/scss/components/_collection-tree.scss
+++ b/scss/components/_collection-tree.scss
@@ -62,6 +62,8 @@ $icons: (
 	.cell.primary {
 		display: flex;
 		align-items: center;
+		// Stretch the cell to full height
+		align-self: stretch;
 
 		:not(.cell-text) {
 			flex-shrink: 0
@@ -75,12 +77,16 @@ $icons: (
 		}
 
 		input.cell-text {
-			border: 1px highlight solid;
+			// Stretch the input to full height and be centered vertically
+			align-self: stretch;
+			border: none;
+			outline: color-mix(in srgb, var(--color-accent) 80%, var(--material-background)) solid 2px;
 			padding: 1px 2px;
 			margin-right: 5px;
 			width: 100%;
 			font-size: inherit;
 			pointer-events: auto;
+			background: var(--material-background);
 		}
 
 		.cell-icon {