diff --git a/src/components/BrowserCell/BrowserCell.react.js b/src/components/BrowserCell/BrowserCell.react.js
index 1e46dda562..9d16b142b4 100644
--- a/src/components/BrowserCell/BrowserCell.react.js
+++ b/src/components/BrowserCell/BrowserCell.react.js
@@ -131,7 +131,7 @@ export default class BrowserCell extends Component {
     } else if (this.props.type === 'Object' || this.props.type === 'Bytes') {
       this.copyableValue = content = JSON.stringify(this.props.value);
     } else if (this.props.type === 'File') {
-      const fileName = this.props.value.url() ? getFileName(this.props.value) : 'Uploading\u2026';
+      const fileName = this.props.value ? this.props.value.url() ? getFileName(this.props.value) : this.props.value.name() : 'Uploading\u2026';
       content = <Pill value={fileName} fileDownloadLink={this.props.value.url()} shrinkablePill />;
       this.copyableValue = fileName;
     } else if (this.props.type === 'ACL') {
diff --git a/src/dashboard/Data/Browser/EditRowDialog.react.js b/src/dashboard/Data/Browser/EditRowDialog.react.js
index 345464b02e..bbe0f7a56a 100644
--- a/src/dashboard/Data/Browser/EditRowDialog.react.js
+++ b/src/dashboard/Data/Browser/EditRowDialog.react.js
@@ -352,7 +352,7 @@ export default class EditRowDialog extends React.Component {
           break;
         case 'File':
           let file = selectedObject[name];
-          let fileName = file && file.url() ? getFileName(file) : '';
+          let fileName = file ? file.url() ? getFileName(file) : file.name() : '';
           inputComponent = (
             <div className={[styles.editRowDialogFileCell]}>
               {file && <Pill value={fileName} fileDownloadLink={file.url()} />}