diff --git a/client/homebrew/navbar/metadata.navitem.jsx b/client/homebrew/navbar/metadata.navitem.jsx
index 9f56e89e3..746f6b88a 100644
--- a/client/homebrew/navbar/metadata.navitem.jsx
+++ b/client/homebrew/navbar/metadata.navitem.jsx
@@ -35,7 +35,11 @@ const MetadataNav = createClass({
 
 	getTags : function(){
 		if(!this.props.brew.tags) return 'No tags';
-		return this.props.brew.tags.join(', ');
+		return <>
+			{this.props.brew.tags.map((tag, idx)=>{
+				return <span className='tag' key={idx}>{tag}</span>;
+			})}
+		</>;
 	},
 
 	getSystems : function(){
diff --git a/client/homebrew/navbar/navbar.less b/client/homebrew/navbar/navbar.less
index b24e43d48..831c25a89 100644
--- a/client/homebrew/navbar/navbar.less
+++ b/client/homebrew/navbar/navbar.less
@@ -218,6 +218,13 @@
 						flex-basis       : 80%;
 						flex-grow        : 1;
 						border-top       : 1px solid #888;
+						.tag{
+							border: 2px solid grey;
+							padding: 2px;
+							margin: -2px 2px;
+							display: inline-block;
+							border-radius: 5px;
+						}
 					}
 				}
 			}