diff --git a/lib/osf-components/addon/components/file-browser/file-item/styles.scss b/lib/osf-components/addon/components/file-browser/file-item/styles.scss
index 6d6012752f1..538af8b707d 100644
--- a/lib/osf-components/addon/components/file-browser/file-item/styles.scss
+++ b/lib/osf-components/addon/components/file-browser/file-item/styles.scss
@@ -68,7 +68,7 @@
 .FileList__item__options {
     display: flex;
     align-items: center;
-    flex: 1;
+    padding-right: 2vw;
 }
 
 .FileList__item__name {
diff --git a/lib/osf-components/addon/components/file-browser/file-item/template.hbs b/lib/osf-components/addon/components/file-browser/file-item/template.hbs
index 6aa6214dc83..714d7e55094 100644
--- a/lib/osf-components/addon/components/file-browser/file-item/template.hbs
+++ b/lib/osf-components/addon/components/file-browser/file-item/template.hbs
@@ -57,7 +57,9 @@
                 data-test-file-list-download-count
                 local-class='FileList__item__download_count'
             >
-                {{t 'osf-components.file-browser.download_count' count=@item.fileModel.extra.downloads}}
+                {{#if (has-key @item.fileModel.extra 'downloads')}}
+                    {{t 'osf-components.file-browser.download_count' count=@item.fileModel.extra.downloads}}
+                {{/if}}
             </div>
             <div
                 data-test-file-list-size
@@ -78,7 +80,10 @@
                 {{/if}}
             </div>
         {{/if}}
-        <div data-test-file-list-options local-class='FileList__item__options'>
+        <div
+            data-test-file-list-options
+            local-class='FileList__item__options'
+        >
             {{#unless @manager.selectedFiles}}
                 <FileActionsMenu @item={{@item}} @onDelete={{@manager.reload}} @manager={{@manager}} @allowRename={{true}} />
             {{/unless}}
diff --git a/lib/osf-components/addon/components/file-browser/folder-item/styles.scss b/lib/osf-components/addon/components/file-browser/folder-item/styles.scss
index c88c1830489..a0b453ef02c 100644
--- a/lib/osf-components/addon/components/file-browser/folder-item/styles.scss
+++ b/lib/osf-components/addon/components/file-browser/folder-item/styles.scss
@@ -62,7 +62,7 @@
 .FileList__item__options {
     display: flex;
     align-items: center;
-    flex: 1;
+    padding-right: 2vw;
 }
 
 .MobileDropdownTrigger {
diff --git a/lib/osf-components/addon/components/file-browser/folder-item/template.hbs b/lib/osf-components/addon/components/file-browser/folder-item/template.hbs
index a335e61935a..95094b49aa0 100644
--- a/lib/osf-components/addon/components/file-browser/folder-item/template.hbs
+++ b/lib/osf-components/addon/components/file-browser/folder-item/template.hbs
@@ -40,7 +40,11 @@
         {{#if this.showActionsDropdown}}
             <div
                 data-test-file-list-date
-                local-class='FileList__item__options NoShrink {{if (or this.media.isTablet this.media.isMobile) 'MobileDropdownTrigger'}}'
+                local-class='
+                    FileList__item__options
+                    NoShrink
+                    {{if (or this.media.isTablet this.media.isMobile) 'MobileDropdownTrigger'}}
+                '
             >
                 <ResponsiveDropdown
                     local-class='DownloadShareDropdown'
diff --git a/lib/osf-components/addon/helpers/has-key.ts b/lib/osf-components/addon/helpers/has-key.ts
new file mode 100644
index 00000000000..be204b7c946
--- /dev/null
+++ b/lib/osf-components/addon/helpers/has-key.ts
@@ -0,0 +1,10 @@
+import { helper } from '@ember/component/helper';
+
+export function hasKey([object, key]: [any, any]): any {
+    if (object) {
+        return (key in object);
+    }
+    return false;
+}
+
+export default helper(hasKey);
diff --git a/lib/osf-components/app/helpers/has-key.js b/lib/osf-components/app/helpers/has-key.js
new file mode 100644
index 00000000000..18f31874796
--- /dev/null
+++ b/lib/osf-components/app/helpers/has-key.js
@@ -0,0 +1 @@
+export { default } from 'osf-components/helpers/has-key';
diff --git a/tests/unit/helpers/has-key-test.ts b/tests/unit/helpers/has-key-test.ts
new file mode 100644
index 00000000000..0ac4ff63359
--- /dev/null
+++ b/tests/unit/helpers/has-key-test.ts
@@ -0,0 +1,19 @@
+import { hasKey } from 'osf-components/helpers/has-key';
+import { module, test } from 'qunit';
+
+module('Unit | Helper | has-key', () => {
+    test('returns correct boolean value', assert => {
+        const object = { itzy: 'hey' };
+        const absentKey = 'twice';
+        const existingKey = 'itzy';
+        assert.equal(hasKey([object, absentKey]), false);
+        assert.equal(hasKey([object, existingKey]), true);
+    });
+
+    test('returns false when object is null or undefined', assert => {
+        // eslint-disable-next-line no-undef-init
+        const object = undefined;
+        assert.equal(hasKey([null, 'a']), false);
+        assert.equal(hasKey([object, 'b']), false);
+    });
+});