diff --git a/src/ui/component/claimTags/view.jsx b/src/ui/component/claimTags/view.jsx
index dde5d7382..7e5b20401 100644
--- a/src/ui/component/claimTags/view.jsx
+++ b/src/ui/component/claimTags/view.jsx
@@ -42,6 +42,10 @@ export default function ClaimTags(props: Props) {
     }
   }
 
+  if (!tagsToDisplay.length) {
+    return null;
+  }
+
   return (
     <div className={classnames('file-properties', { 'file-properties--large': type === 'large' })}>
       {tagsToDisplay.map(tag => (
diff --git a/src/ui/component/expandable/view.jsx b/src/ui/component/expandable/view.jsx
index 607e713a8..15b0fe37a 100644
--- a/src/ui/component/expandable/view.jsx
+++ b/src/ui/component/expandable/view.jsx
@@ -4,9 +4,7 @@ import classnames from 'classnames';
 import Button from 'component/button';
 import { useRect } from '@reach/rect';
 
-// Note:
-// When we use this in other parts of the app, we will probably need to
-// add props for collapsed height
+const COLLAPSED_HEIGHT = 120;
 
 type Props = {
   children: React$Node | Array<React$Node>,
@@ -24,7 +22,7 @@ export default function Expandable(props: Props) {
 
   return (
     <div ref={ref}>
-      {rect && rect.height > 120 ? (
+      {rect && rect.height > COLLAPSED_HEIGHT ? (
         <div ref={ref} className="expandable">
           <div
             className={classnames({
diff --git a/src/ui/scss/component/_expandable.scss b/src/ui/scss/component/_expandable.scss
index 867b63e69..f0d41742e 100644
--- a/src/ui/scss/component/_expandable.scss
+++ b/src/ui/scss/component/_expandable.scss
@@ -1,5 +1,4 @@
 .expandable {
-  //border-bottom: 1px solid $lbry-gray-1;
   margin-bottom: var(--spacing-medium);
   padding-bottom: var(--spacing-medium);