diff --git a/ui/js/component/fileActions/view.jsx b/ui/js/component/fileActions/view.jsx
index b437341d5..cf6db5680 100644
--- a/ui/js/component/fileActions/view.jsx
+++ b/ui/js/component/fileActions/view.jsx
@@ -81,6 +81,9 @@ class FileActions extends React.PureComponent {
       navigate,
     } = this.props;
 
+    const name = fileInfo ? fileInfo.name : null;
+    const channel = fileInfo ? fileInfo.channel_name : null;
+
     const metadata = fileInfo ? fileInfo.metadata : null,
       openInFolderMessage = platform.startsWith("Mac")
         ? __("Open in Finder")
@@ -189,7 +192,7 @@ class FileActions extends React.PureComponent {
                 {claimIsMine &&
                 <DropDownMenuItem
                   key={1}
-                  onClick={() => navigate("/publish", { name: fileInfo.name })}
+                  onClick={() => navigate("/publish", { name, channel })}
                   label={__("Edit claim")}
                 />}
                 <DropDownMenuItem
diff --git a/ui/js/component/publishForm/view.jsx b/ui/js/component/publishForm/view.jsx
index 5ada5c29e..69dfcf9b4 100644
--- a/ui/js/component/publishForm/view.jsx
+++ b/ui/js/component/publishForm/view.jsx
@@ -418,12 +418,14 @@ class PublishForm extends React.PureComponent {
   }
 
   componentWillMount() {
-    const { name } = this.props.params;
+    const { name, channel } = this.props.params;
 
     this.props.fetchClaimListMine();
     this._updateChannelList();
 
-    if (name) this.setState({ name });
+    if (name && channel) {
+      this.setState({ name, rawName: name, channel });
+    }
   }
 
   componentDidMount() {