diff --git a/src/components/file/DashboardFile/FileViewer.tsx b/src/components/file/DashboardFile/FileViewer.tsx
index bdabb700..9fa603ca 100644
--- a/src/components/file/DashboardFile/FileViewer.tsx
+++ b/src/components/file/DashboardFile/FileViewer.tsx
@@ -550,10 +550,11 @@ export default function FileViewer({
                 flexDirection: 'column',
                 alignItems: 'center',
                 justifyContent: 'flex-start',
-                width: '100%',
-                height: 'fit-content',
+                alignSelf: 'stretch',
+                flex: 1,
                 minWidth: 0,
                 minHeight: 0,
+                width: '100%',
                 overflow: 'visible',
                 paddingLeft: '4rem',
                 paddingRight: '4rem',
diff --git a/src/components/file/DashboardFileType/index.tsx b/src/components/file/DashboardFileType/index.tsx
index 10417db5..0519c500 100644
--- a/src/components/file/DashboardFileType/index.tsx
+++ b/src/components/file/DashboardFileType/index.tsx
@@ -36,6 +36,24 @@ export function Placeholder({ text, Icon, ...props }: { text: string; Icon: Icon
   );
 }
 
+function FullscreenSizedMedia({ children }: { children: React.ReactNode }) {
+  return (
+    <Box
+      style={{
+        flex: 1,
+        alignSelf: 'stretch',
+        minHeight: 0,
+        width: '100%',
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+      }}
+    >
+      {children}
+    </Box>
+  );
+}
+
 export default function DashboardFileType({
   file,
   show,
@@ -97,9 +115,6 @@ export default function DashboardFileType({
   }
 
   const isAsciicast = file.type === 'application/x-asciicast' || file.name.endsWith('.cast');
-  const mediaMax = fullscreen
-    ? { maxWidth: 'min(96vw, calc(100vw - 3rem))', maxHeight: 'calc(100vh - 7.5rem)' }
-    : undefined;
 
   if (type === 'video') {
     if (!fileUrl) return <Loader />;
@@ -123,21 +138,24 @@ export default function DashboardFileType({
       return <Placeholder text={`Click to play video ${file.name}`} Icon={fileIcon(file.type)} />;
     }
 
-    return (
+    const video = (
       <video
-        width='100%'
+        width={fullscreen ? undefined : '100%'}
         autoPlay
         muted
         controls
         src={fileUrl}
         style={{
           cursor: 'pointer',
+          objectFit: 'contain',
           ...(fullscreen
-            ? { ...mediaMax, width: 'auto', height: 'auto' }
-            : { maxWidth: '85vw', maxHeight: '85vh' }),
+            ? { maxWidth: '100%', maxHeight: '100%', width: 'auto', height: 'auto' }
+            : { maxWidth: '85vw', maxHeight: '85vh', width: '100%' }),
         }}
       />
     );
+
+    return fullscreen ? <FullscreenSizedMedia>{video}</FullscreenSizedMedia> : video;
   }
 
   if (type === 'image') {
@@ -147,20 +165,26 @@ export default function DashboardFileType({
       return <MantineImage fit='contain' mah={400} src={fileUrl} alt={file.name || 'Image'} />;
     }
 
+    const image = (
+      <MantineImage
+        src={fileUrl}
+        alt={file.name || 'Image'}
+        fit='contain'
+        style={{
+          cursor: allowZoom ? 'zoom-in' : 'default',
+          objectFit: 'contain',
+          display: 'block',
+          ...(fullscreen
+            ? { maxWidth: '100%', maxHeight: '100%', width: 'auto', height: 'auto' }
+            : { maxWidth: '70vw', maxHeight: '70vw' }),
+        }}
+        onClick={() => allowZoom && setZoomOpen(true)}
+      />
+    );
+
     return (
-      <Center>
-        <MantineImage
-          src={fileUrl}
-          alt={file.name || 'Image'}
-          style={{
-            cursor: allowZoom ? 'zoom-in' : 'default',
-            objectFit: 'contain',
-            ...(fullscreen
-              ? { ...mediaMax, width: 'auto', height: 'auto' }
-              : { maxWidth: '70vw', maxHeight: '70vw' }),
-          }}
-          onClick={() => allowZoom && setZoomOpen(true)}
-        />
+      <>
+        {fullscreen ? <FullscreenSizedMedia>{image}</FullscreenSizedMedia> : <Center>{image}</Center>}
         {allowZoom && zoomOpen && (
           <FileZoomModal setOpen={setZoomOpen}>
             <MantineImage
@@ -176,7 +200,7 @@ export default function DashboardFileType({
             />
           </FileZoomModal>
         )}
-      </Center>
+      </>
     );
   }