diff --git a/app/components/asset-reminder/reminders-table.tsx b/app/components/asset-reminder/reminders-table.tsx
index b413d8ace..082c09da7 100644
--- a/app/components/asset-reminder/reminders-table.tsx
+++ b/app/components/asset-reminder/reminders-table.tsx
@@ -1,5 +1,6 @@
 import { useState } from "react";
 import type { Prisma } from "@prisma/client";
+import { useParams } from "@remix-run/react";
 import colors from "tailwindcss/colors";
 import type { ASSET_REMINDER_INCLUDE_FIELDS } from "~/modules/asset-reminder/fields";
 import { List } from "../list";
@@ -29,6 +30,7 @@ export default function RemindersTable({
   isAssetReminderPage,
 }: RemindersTableProps) {
   const [isReminderDialogOpen, setIsReminderDialogOpen] = useState(false);
+  const { assetId } = useParams<{ assetId: string }>();
 
   const emptyStateTitle = isAssetReminderPage
     ? "No reminders for this asset"
@@ -86,6 +88,7 @@ export default function RemindersTable({
       />
 
       <SetOrEditReminderDialog
+        action={isAssetReminderPage ? `/assets/${assetId}` : undefined}
         open={isReminderDialogOpen}
         onClose={() => {
           setIsReminderDialogOpen(false);
diff --git a/app/components/asset-reminder/set-or-edit-reminder-dialog.tsx b/app/components/asset-reminder/set-or-edit-reminder-dialog.tsx
index d67dd3362..5f89ddfcc 100644
--- a/app/components/asset-reminder/set-or-edit-reminder-dialog.tsx
+++ b/app/components/asset-reminder/set-or-edit-reminder-dialog.tsx
@@ -1,6 +1,6 @@
 import { useEffect } from "react";
 import { Form, useNavigation } from "@remix-run/react";
-import { useLocation, useParams, useSearchParams } from "react-router-dom";
+import { useLocation, useSearchParams } from "react-router-dom";
 import { useZorm } from "react-zorm";
 import { z } from "zod";
 import Input from "~/components/forms/input";
@@ -25,16 +25,17 @@ type SetOrEditReminderDialogProps = {
   open: boolean;
   onClose: () => void;
   reminder?: z.infer<typeof setReminderSchema> & { id: string };
+  action?: string;
 };
 
 export default function SetOrEditReminderDialog({
   open,
   onClose,
   reminder,
+  action,
 }: SetOrEditReminderDialogProps) {
   const navigation = useNavigation();
   const disabled = isFormProcessing(navigation.state);
-  const { assetId } = useParams<{ assetId: string }>();
 
   const pathname = useLocation().pathname;
   const [searchParams, setSearchParams] = useSearchParams();
@@ -84,7 +85,7 @@ export default function SetOrEditReminderDialog({
           method="POST"
           encType="multipart/form-data"
           className="grid grid-cols-1 divide-x md:grid-cols-2"
-          action={`/assets/${assetId}`}
+          action={action}
         >
           <div className="px-6 py-4">
             <input
diff --git a/app/components/assets/actions-dropdown.tsx b/app/components/assets/actions-dropdown.tsx
index fe4f7fd15..9aadcc57d 100644
--- a/app/components/assets/actions-dropdown.tsx
+++ b/app/components/assets/actions-dropdown.tsx
@@ -317,6 +317,7 @@ const ConditionalActionsDropdown = () => {
       </When>
       <When truthy={isSetReminderDialogOpen && isAdministratorOrOwner}>
         <SetOrEditReminderDialog
+          action={`/assets/${asset.id}`}
           open={isSetReminderDialogOpen}
           onClose={() => {
             setIsSetReminderDialogOpen(false);