diff --git a/src/App.css b/src/App.css
index ff0d5f2..377e315 100644
--- a/src/App.css
+++ b/src/App.css
@@ -715,6 +715,14 @@ input.switch:checked ~ label:after {
   margin-right: 0.5rem;
 }
 
+.item-tags .item-tag:after {
+    content: ', ';
+}
+.item-tags .item-tag:last-child:after {
+    content: '';
+}
+
+
 /* To put duration on its own line, remove this bit. */
 .item-duration {
   display: inline-block;
diff --git a/src/components/Tag.js b/src/components/Tag.js
index 7a063c5..fdcef8f 100644
--- a/src/components/Tag.js
+++ b/src/components/Tag.js
@@ -1,7 +1,7 @@
 import { Format } from '../utils/Format'
 
 const Tag = ({ tag }) => {
-  return <div className="item-tag">{Format.formatTag(tag)},</div>;
+  return <div className="item-tag">{Format.formatTag(tag)}</div>;
 };
 
 export default Tag;