diff --git a/ui/js/component/fileList/view.jsx b/ui/js/component/fileList/view.jsx
index 9c47f5899..20631b59e 100644
--- a/ui/js/component/fileList/view.jsx
+++ b/ui/js/component/fileList/view.jsx
@@ -67,11 +67,15 @@ class FileList extends React.PureComponent {
     const content = [];
 
     this._sortFunctions[sortBy](fileInfos).forEach(fileInfo => {
-      const uri = lbryuri.build({
-        contentName: fileInfo.name,
-        channelName: fileInfo.channel_name,
-        claimId: fileInfo.claim_id,
-      });
+      let uriParams = {};
+      if (fileInfo.channel_name) {
+        uriParams.channelName = fileInfo.channel_name;
+        uriParams.contentName = fileInfo.name;
+      } else {
+        uriParams.claimId = fileInfo.claim_id;
+        uriParams.name = fileInfo.name;
+      }
+      const uri = lbryuri.build(uriParams);
 
       content.push(
         <FileTile
diff --git a/ui/js/lbry.js b/ui/js/lbry.js
index 589a4a650..a2de3b837 100644
--- a/ui/js/lbry.js
+++ b/ui/js/lbry.js
@@ -37,6 +37,7 @@ function apiCall(method, params, resolve, reject) {
  * Records a publish attempt in local storage. Returns a dictionary with all the data needed to
  * needed to make a dummy claim or file info object.
  */
+let pendingId = 0;
 function savePendingPublish({ name, channel_name }) {
   let uri;
   if (channel_name) {
@@ -44,14 +45,15 @@ function savePendingPublish({ name, channel_name }) {
   } else {
     uri = lbryuri.build({ name: name }, false);
   }
+  ++pendingId;
   const pendingPublishes = getLocal("pendingPublishes") || [];
   const newPendingPublish = {
     name,
     channel_name,
-    claim_id: "pending-" + uri,
-    txid: "pending_" + uri,
+    claim_id: "pending-" + pendingId,
+    txid: "pending-" + pendingId,
     nout: 0,
-    outpoint: "pending-" + uri + ":0",
+    outpoint: "pending-" + pendingId + ":0",
     time: Date.now(),
   };
   setLocal("pendingPublishes", [...pendingPublishes, newPendingPublish]);
diff --git a/ui/js/lbryuri.js b/ui/js/lbryuri.js
index c758c8935..1fcfdec58 100644
--- a/ui/js/lbryuri.js
+++ b/ui/js/lbryuri.js
@@ -122,7 +122,7 @@ lbryuri.parse = function(uri, requireProto = false) {
     const pathBadChars = path.match(/[^A-Za-z0-9-]/g);
     if (pathBadChars) {
       throw new Error(
-        __(`Invalid character in path: %s`, nameBadChars.join(", "))
+        __(`Invalid character in path: %s`, pathBadChars.join(", "))
       );
     }