diff --git a/media_manager/movies/service.py b/media_manager/movies/service.py
index 5914923..0b77aa9 100644
--- a/media_manager/movies/service.py
+++ b/media_manager/movies/service.py
@@ -128,21 +128,18 @@ class MovieService:
         :param delete_torrents: Whether to delete associated torrents from the torrent client.
         """
         if delete_files_on_disk or delete_torrents:
-            movie = self.movie_repository.get_movie(movie_id=movie_id)
+            movie = self.movie_repository.get_movie_by_id(movie_id=movie_id)
+
+            log.debug(f"Deleting ID: {movie.id} - Name: {movie.name}")
 
             if delete_files_on_disk and movie.library:
-                log.info("Attempting to delete movie files from disk.")
                 # Get the movie's directory path
-                library_config = next(
-                    (lib for lib in AllEncompassingConfig().misc.movie_libraries if lib.name == movie.library),
-                    None
-                )
-                log.debug(f"Library config for movie deletion: {library_config}")
-                if library_config:
-                    movie_path = Path(library_config.path) / movie.folder_name
-                    if movie_path.exists() and movie_path.is_dir():
-                        shutil.rmtree(movie_path)
-                        log.info(f"Deleted movie directory: {movie_path}")
+                movie_dir = self.get_movie_root_path(movie=movie)
+
+                log.debug(f"Attempt to delete movie directory: {movie_dir}")
+                if movie_dir.exists() and movie_dir.is_dir():
+                    shutil.rmtree(movie_dir)
+                    log.info(f"Deleted movie directory: {movie_dir}")
 
             if delete_torrents:
                 # Get all torrents associated with this movie
diff --git a/media_manager/tv/service.py b/media_manager/tv/service.py
index 96339af..8af7b5d 100644
--- a/media_manager/tv/service.py
+++ b/media_manager/tv/service.py
@@ -146,21 +146,16 @@ class TvService:
         if delete_files_on_disk or delete_torrents:
             show = self.tv_repository.get_show_by_id(show_id)
 
-            log.debug(f"ID: {show.id} - Name: {show.name} - Library: {show.library}")
+            log.debug(f"Deleting ID: {show.id} - Name: {show.name}")
 
-            if delete_files_on_disk and show.library:
-                log.info("Attempting to delete show files from disk.")
+            if delete_files_on_disk:
                 # Get the show's directory path
-                library_config = next(
-                    (lib for lib in AllEncompassingConfig().misc.tv_libraries if lib.name == show.library),
-                    None
-                )
-                log.debug(f"Library config for show deletion: {library_config}")
-                if library_config:
-                    show_path = Path(library_config.path) / show.folder_name
-                    if show_path.exists() and show_path.is_dir():
-                        shutil.rmtree(show_path)
-                        log.info(f"Deleted show directory: {show_path}")
+                show_dir = self.get_root_show_directory(show=show)
+
+                log.debug(f"Attempt to delete show directory: {show_dir}")
+                if show_dir.exists() and show_dir.is_dir():
+                    shutil.rmtree(show_dir)
+                    log.info(f"Deleted show directory: {show_dir}")
 
             if delete_torrents:
                 # Get all torrents associated with this show
diff --git a/web/src/routes/dashboard/movies/[movieId=uuid]/+page.svelte b/web/src/routes/dashboard/movies/[movieId=uuid]/+page.svelte
index eb52ff8..fce273a 100644
--- a/web/src/routes/dashboard/movies/[movieId=uuid]/+page.svelte
+++ b/web/src/routes/dashboard/movies/[movieId=uuid]/+page.svelte
@@ -138,21 +138,25 @@
 										<strong>{getFullyQualifiedMediaName(movie)}</strong> from the database.
 									</AlertDialog.Description>
 								</AlertDialog.Header>
-								<div class="flex items-center space-x-2 py-4">
-									<Checkbox bind:checked={deleteFilesOnDisk} id="delete-files" />
-									<Label
-										for="delete-files"
-										class="text-sm leading-none font-medium peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
-									>
-										Also delete files on disk
-									</Label>
-									<Checkbox bind:checked={deleteTorrents} id="delete-torrents" />
-									<Label
-										for="delete-torrents"
-										class="text-sm leading-none font-medium peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
-									>
-										Also delete torrents
-									</Label>
+								<div class="flex flex-col gap-3 py-4">
+									<div class="flex items-center space-x-2">
+										<Checkbox bind:checked={deleteFilesOnDisk} id="delete-files" />
+										<Label
+											for="delete-files"
+											class="text-sm leading-none font-medium peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+										>
+											Also delete files on disk
+										</Label>
+									</div>
+									<div class="flex items-center space-x-2">
+										<Checkbox bind:checked={deleteTorrents} id="delete-torrents" />
+										<Label
+											for="delete-torrents"
+											class="text-sm leading-none font-medium peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+										>
+											Also delete torrents
+										</Label>
+									</div>
 								</div>
 								<AlertDialog.Footer>
 									<AlertDialog.Cancel>Cancel</AlertDialog.Cancel>