diff --git a/pkg/models/model_gallery.go b/pkg/models/model_gallery.go
index c9cc35a75..eced42ebc 100644
--- a/pkg/models/model_gallery.go
+++ b/pkg/models/model_gallery.go
@@ -2,6 +2,7 @@ package models
 
 import (
 	"context"
+	"path/filepath"
 	"strconv"
 	"time"
 
@@ -128,7 +129,7 @@ func (g Gallery) GetTitle() string {
 		return g.Title
 	}
 
-	return g.Path
+	return filepath.Base(g.Path)
 }
 
 // DisplayName returns a display name for the scene for logging purposes.
diff --git a/pkg/scraper/stash.go b/pkg/scraper/stash.go
index 73e14e7ec..9267bad0c 100644
--- a/pkg/scraper/stash.go
+++ b/pkg/scraper/stash.go
@@ -319,9 +319,12 @@ func sceneToUpdateInput(scene *models.Scene) models.SceneUpdateInput {
 		return nil
 	}
 
+	// fallback to file basename if title is empty
+	title := scene.GetTitle()
+
 	return models.SceneUpdateInput{
 		ID:      strconv.Itoa(scene.ID),
-		Title:   &scene.Title,
+		Title:   &title,
 		Details: &scene.Details,
 		URL:     &scene.URL,
 		Date:    dateToStringPtr(scene.Date),
@@ -338,9 +341,12 @@ func galleryToUpdateInput(gallery *models.Gallery) models.GalleryUpdateInput {
 		return nil
 	}
 
+	// fallback to file basename if title is empty
+	title := gallery.GetTitle()
+
 	return models.GalleryUpdateInput{
 		ID:      strconv.Itoa(gallery.ID),
-		Title:   &gallery.Title,
+		Title:   &title,
 		Details: &gallery.Details,
 		URL:     &gallery.URL,
 		Date:    dateToStringPtr(gallery.Date),
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
index 33344223d..e9dd5be6d 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
@@ -476,7 +476,7 @@ export const SceneEditPanel: React.FC<IProps> = ({
           setScraper(undefined);
           onSceneSelected(s);
         }}
-        name={formik.values.title || ""}
+        name={formik.values.title || objectTitle(scene) || ""}
       />
     );
   };