diff --git a/Francesco.Recipes.World/Views/Shared/_Layout.cshtml b/Francesco.Recipes.World/Views/Shared/_Layout.cshtml
index 463da8d..a06f9bd 100644
--- a/Francesco.Recipes.World/Views/Shared/_Layout.cshtml
+++ b/Francesco.Recipes.World/Views/Shared/_Layout.cshtml
@@ -63,16 +63,18 @@
 	<script src="~/js/site.js" asp-append-version="true"></script>
 	<script src="https://unpkg.com/htmx.org@2.0.4/dist/htmx.js" integrity="sha384-oeUn82QNXPuVkGCkcrInrS1twIxKhkZiFfr2TdiuObZ3n3yIeMiqcRzkIcguaof1" crossorigin="anonymous"></script>
 	<script>
-		let recipeId;
+
+			let recipeId;
 		@if (ViewData["RecipeId"] != null)
 		{
 			<text>recipeId = '@ViewData["RecipeId"]';</text>
 		}
-		else if (ViewContext.View.Path.Contains("Recipe/Create") && Model?.CategoryId != null)
+		else if (ViewData["CategoryId"] != null)
 		{
-			<text>recipeId = '@Model.CategoryId';</text>
+			<text>recipeId = '@ViewData["CategoryId"]';</text>
 		}
 
+
 		const darkModeToggle = document.getElementById('darkModeToggle');
 		const lightModeToggle = document.getElementById('lightModeToggle');
 		darkModeToggle.addEventListener('click', () => {