diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.less b/client/homebrew/editor/metadataEditor/metadataEditor.less
index 27ebd88c2..914af9c4e 100644
--- a/client/homebrew/editor/metadataEditor/metadataEditor.less
+++ b/client/homebrew/editor/metadataEditor/metadataEditor.less
@@ -270,7 +270,7 @@
 			&:last-child { border-radius : 0 0.5em 0.5em 0; }
 		}
 
-		.badge {
+		.tag {
 			padding          : 0.3em;
 			margin           : 2px;
 			font-size        : 0.9em;
diff --git a/client/homebrew/editor/tagInput/tagInput.jsx b/client/homebrew/editor/tagInput/tagInput.jsx
index 9391b9c16..bd3f53db4 100644
--- a/client/homebrew/editor/tagInput/tagInput.jsx
+++ b/client/homebrew/editor/tagInput/tagInput.jsx
@@ -7,9 +7,15 @@ const TagInput = ({unique = true, values = [], ...props})=>{
 	const [temporaryValue, setTemporaryValue] = useState('');
 	const [valueContext, setValueContext] = useState(values.map((value)=>({ value: value, editing : false })));
 
-	const tagElement = (value)=>{
+	const readTag = (value)=>{
 		return (
-			<div className={`badge`}>{value}</div>
+			<div className={`tag`}>{value}</div>
+		)
+	}
+
+	const writeTag = (value)=>{
+		return (
+			<input type='text' value={value} />
 		)
 	}
 
@@ -17,13 +23,16 @@ const TagInput = ({unique = true, values = [], ...props})=>{
 		<div className='field'>
 
 			<label>{props.label}</label>
-			{Object.values(valueContext).map((context, i)=>{ return context.editing ? tagElement('editing') : tagElement(context.value) })}
+			<div className='list'>
 
-			<input type='text'
-				className={`value`}
-				placeholder={props.placeholder}
-				value={temporaryValue}
-				onChange={(e)=>setTemporaryValue(e.target.value)} />
+				{Object.values(valueContext).map((context, i)=>{ return context.editing ? writeTag(context.value) : readTag(context.value) })}
+
+				<input type='text'
+					className={`value`}
+					placeholder={props.placeholder}
+					value={temporaryValue}
+					onChange={(e)=>setTemporaryValue(e.target.value)} />
+			</div>
 		</div>
 	)
 }