diff --git a/src/Mangarr.Frontend/Pages/Manga/Link/AddModal.razor b/src/Mangarr.Frontend/Pages/Manga/Link/AddModal.razor
index a967e74..d279859 100644
--- a/src/Mangarr.Frontend/Pages/Manga/Link/AddModal.razor
+++ b/src/Mangarr.Frontend/Pages/Manga/Link/AddModal.razor
@@ -1,5 +1,4 @@
-@using System.Web
-<div class="modal fade" id="add-manga-modal-@HttpUtility.UrlEncode(MangaId)" tabindex="-1">
+<div class="modal fade" id="add-manga-modal-@SafeMangaId" tabindex="-1">
     <div class="modal-dialog modal-dialog-centered">
         <div class="modal-content">
             <div class="modal-header">
diff --git a/src/Mangarr.Frontend/Pages/Manga/Link/AddModal.razor.cs b/src/Mangarr.Frontend/Pages/Manga/Link/AddModal.razor.cs
index 86c326e..4c5d4e2 100644
--- a/src/Mangarr.Frontend/Pages/Manga/Link/AddModal.razor.cs
+++ b/src/Mangarr.Frontend/Pages/Manga/Link/AddModal.razor.cs
@@ -1,19 +1,22 @@
-using Microsoft.AspNetCore.Components;
+using System.Web;
+using Microsoft.AspNetCore.Components;
 
 namespace Mangarr.Frontend.Pages.Manga.Link;
 
 public partial class AddModal
 {
+    private bool _monitorNewChaptersOnly;
     [Parameter] public string Id { get; set; } = null!;
     [Parameter] public string Identifier { get; set; } = null!;
     [Parameter] public string MangaId { get; set; } = null!;
 
-    [Inject] public NavigationManager NavigationManager { get; set; } = null!;
+    private string SafeMangaId => MangaId.Replace('+', '-').Replace('/', '_').Replace('=', '.');
 
-    private bool _monitorNewChaptersOnly;
+    [Inject] public NavigationManager NavigationManager { get; set; } = null!;
 
     private void ToggleMonitorNewChaptersOnly() => _monitorNewChaptersOnly = !_monitorNewChaptersOnly;
 
     private void OnAddClick() =>
-        NavigationManager.NavigateTo($"/manga/{Id}/add/{Identifier}/{MangaId}/{_monitorNewChaptersOnly}");
+        NavigationManager.NavigateTo(
+            $"/manga/{Id}/add/{Identifier}/{HttpUtility.UrlEncode(MangaId)}/{_monitorNewChaptersOnly}");
 }
diff --git a/src/Mangarr.Frontend/Pages/Manga/Link/ContentSourceItem.razor b/src/Mangarr.Frontend/Pages/Manga/Link/ContentSourceItem.razor
index daf5cba..15973e1 100644
--- a/src/Mangarr.Frontend/Pages/Manga/Link/ContentSourceItem.razor
+++ b/src/Mangarr.Frontend/Pages/Manga/Link/ContentSourceItem.razor
@@ -1,8 +1,7 @@
-@using System.Web
-<div class="d-flex flex-column card p-2 me-2 content-source-item">
+<div class="d-flex flex-column card p-2 me-2 content-source-item">
     <img class="content-source-item-cover" src="@CoverImage" alt="cover" referrerpolicy="no-referrer">
     <p class="text-truncate">@Title</p>
-    <button class="btn btn-primary" type="button" data-bs-toggle="modal" data-bs-target="#add-manga-modal-@HttpUtility.UrlEncode(MangaId)">Select</button>
+    <button class="btn btn-primary" type="button" data-bs-toggle="modal" data-bs-target="#add-manga-modal-@SafeMangaId">Select</button>
 </div>
 
 <AddModal Id="@Id" Identifier="@Identifier" MangaId="@MangaId"/>
diff --git a/src/Mangarr.Frontend/Pages/Manga/Link/ContentSourceItem.razor.cs b/src/Mangarr.Frontend/Pages/Manga/Link/ContentSourceItem.razor.cs
index cc55e24..715a96d 100644
--- a/src/Mangarr.Frontend/Pages/Manga/Link/ContentSourceItem.razor.cs
+++ b/src/Mangarr.Frontend/Pages/Manga/Link/ContentSourceItem.razor.cs
@@ -13,4 +13,5 @@ public partial class ContentSourceItem
     private string CoverImage => Item.CoverUrl;
 
     private string MangaId => Item.Id;
+    private string SafeMangaId => MangaId.Replace('+', '-').Replace('/', '_').Replace('=', '.');
 }