diff --git a/webapp/channels/src/components/file_attachment/file_attachment.tsx b/webapp/channels/src/components/file_attachment/file_attachment.tsx
index fd79d94cf4..21a58fa63e 100644
--- a/webapp/channels/src/components/file_attachment/file_attachment.tsx
+++ b/webapp/channels/src/components/file_attachment/file_attachment.tsx
@@ -65,6 +65,7 @@ export default function FileAttachment(props: Props) {
     const [loadFilesCalled, setLoadFilesCalled] = useState(false);
     const [keepOpen, setKeepOpen] = useState(false);
     const [openUp, setOpenUp] = useState(false);
+    const [showTooltip, setShowTooltip] = useState(true);
 
     const buttonRef = useRef<HTMLButtonElement | null>(null);
 
@@ -139,6 +140,7 @@ export default function FileAttachment(props: Props) {
     const handleDropdownOpened = (open: boolean) => {
         props.handleFileDropdownOpened?.(open);
         setKeepOpen(open);
+        setShowTooltip(!open);
 
         if (open) {
             setMenuPosition();
@@ -227,6 +229,7 @@ export default function FileAttachment(props: Props) {
             >
                 <WithTooltip
                     title={formatMessage({id: 'file_search_result_item.more_actions', defaultMessage: 'More Actions'})}
+                    disabled={!showTooltip}
                 >
                     <button
                         ref={buttonRef}
diff --git a/webapp/channels/src/sass/components/_files.scss b/webapp/channels/src/sass/components/_files.scss
index ca91d5f67b..3bac076ceb 100644
--- a/webapp/channels/src/sass/components/_files.scss
+++ b/webapp/channels/src/sass/components/_files.scss
@@ -330,6 +330,7 @@
     display: flex;
     overflow: hidden;
     width: 320px;
+    min-width: 204px;
     max-width: 100%;
     height: 6.4rem;
     align-items: center;
@@ -352,6 +353,7 @@
     &:hover,
     &:focus-within,
     &.keep-open {
+        overflow: visible;
         box-shadow: 0 2px 3px 0 rgba(variables.$black, 0.1), 0 2px 3px 0 rgba(variables.$black, 0.1);
 
         .file-dropdown-icon {
@@ -528,10 +530,12 @@
         }
 
         .post-image__detail {
+            overflow: hidden;
             width: 100%;
             min-width: 0;
-            height: 100%;
+            height: 36px;
             line-height: normal;
+            text-overflow: ellipsis;
 
             .post-image__name {
                 display: block;
@@ -575,8 +579,10 @@
             }
 
             .post-image__size {
+                overflow: hidden;
                 margin-left: 4px;
                 opacity: 0.73;
+                text-overflow: ellipsis;
             }
         }
     }