diff --git a/packages/fakeyou.com/src/v2/view/pages/media/MediaPage.tsx b/packages/fakeyou.com/src/v2/view/pages/media/MediaPage.tsx
index 2ad8f12572..ad90786af9 100644
--- a/packages/fakeyou.com/src/v2/view/pages/media/MediaPage.tsx
+++ b/packages/fakeyou.com/src/v2/view/pages/media/MediaPage.tsx
@@ -453,6 +453,18 @@ export default function MediaPage() {
     );
   }
 
+  let title = "";
+
+  if (!!mediaFile?.maybe_title) {
+    title = `${mediaFile?.maybe_title} (${mediaType} file)`;
+  } else if (!!mediaFile?.maybe_original_filename) {
+    title = `${mediaFile?.maybe_original_filename} (${mediaType} file)`;
+  } else if (!!mediaFile?.maybe_model_weight_info?.title) {
+    title = mediaFile?.maybe_model_weight_info?.title;
+  } else {
+    title = `Untitled ${mediaType} file`;
+  }
+
   return (
     <div>
       <Container type="panel" className="mb-5">
@@ -461,8 +473,7 @@ export default function MediaPage() {
             <div>
               <div className="d-flex gap-2 align-items-center flex-wrap">
                 <h1 className="fw-bold mb-2">
-                  {mediaFile?.maybe_model_weight_info?.title ||
-                    `Media ${mediaType}`}
+                  {title}
                 </h1>
               </div>
               <div className="d-flex gap-3 flex-wrap align-items-center">
diff --git a/packages/fakeyou.com/src/v2/view/pages/media/MediaRenamePage.tsx b/packages/fakeyou.com/src/v2/view/pages/media/MediaRenamePage.tsx
index a9a7bfbc25..b90c56a07c 100644
--- a/packages/fakeyou.com/src/v2/view/pages/media/MediaRenamePage.tsx
+++ b/packages/fakeyou.com/src/v2/view/pages/media/MediaRenamePage.tsx
@@ -42,8 +42,10 @@ export default function MediaRenamePage() {
   },[setMediaFile, media_file_token]);
 
   const performRename = async () => {
+    const newTitle = mediaTitle.trim();
+
     RenameMedia(media_file_token, {
-      name: mediaTitle,
+      name: newTitle,
     }).then((res: any) => {
       history.replace(`/media/${media_file_token}`);
     });
@@ -52,7 +54,7 @@ export default function MediaRenamePage() {
   const onChange = (
     ev: React.FormEvent<HTMLInputElement>
   ) => {
-    const value = (ev.target as HTMLInputElement).value.trim();
+    const value = (ev.target as HTMLInputElement).value;
     setMediaTitle(value);
   }