diff --git a/src/js/components/GridItem.js b/src/js/components/GridItem.js
index 82a450b1..7a23f0d1 100755
--- a/src/js/components/GridItem.js
+++ b/src/js/components/GridItem.js
@@ -112,7 +112,7 @@ const GridItem = ({
     to = `/${item.type}/${encodeUri(item.uri)}`;
     if (item.name && item.type !== 'artist') {
       // Strip out "%"; this causes conflicts with our uri decoder
-      to += `/${item.name.replace('%','')}`;
+      to += `/${encodeURIComponent(item.name.replace('%', ''))}`;
     }
   }
 
diff --git a/src/js/components/ListItem.js b/src/js/components/ListItem.js
index 97706e52..8b3ed2c9 100755
--- a/src/js/components/ListItem.js
+++ b/src/js/components/ListItem.js
@@ -139,7 +139,7 @@ const ListItem = ({
       to = item.link;
     } else {
       to = `/${item.type}/${encodeUri(item.uri)}`;
-      if (item.name && item.type !== 'artist') to += `/${item.name}`;
+      if (item.name && item.type !== 'artist') to += `/${encodeURIComponent(item.name)}`;
     }
 
     if (e.target.tagName.toLowerCase() !== 'a') {