diff --git a/Views/Vehicle/_PlanRecordItem.cshtml b/Views/Vehicle/_PlanRecordItem.cshtml
index 21cff13..a2880f7 100644
--- a/Views/Vehicle/_PlanRecordItem.cshtml
+++ b/Views/Vehicle/_PlanRecordItem.cshtml
@@ -1,5 +1,5 @@
 @model PlanRecord
-<div class="taskCard @(Model.Progress == PlanProgress.Done ? "nodrag" : "") text-dark user-select-none mt-2 mb-2" draggable="@(Model.Progress == PlanProgress.Done ? "false" : "true")" ondragstart="dragStart(event, @Model.Id)" onclick="@(Model.Progress == PlanProgress.Done ? $"deletePlanRecord({Model.Id})" : $"showEditPlanRecordModal({Model.Id})")">
+<div class="taskCard @(Model.Progress == PlanProgress.Done ? "nodrag" : "") text-dark user-select-none mt-2 mb-2" draggable="@(Model.Progress == PlanProgress.Done ? "false" : "true")" ondragstart="dragStart(event, @Model.Id)" onclick="@(Model.Progress == PlanProgress.Done ? $"deletePlanRecord({Model.Id}, true)" : $"showEditPlanRecordModal({Model.Id})")">
     <div class="card-body">
         <div class="row">
             <div class="col-12 col-lg-8 text-truncate">
diff --git a/wwwroot/js/planrecord.js b/wwwroot/js/planrecord.js
index c72cd09..99c9127 100644
--- a/wwwroot/js/planrecord.js
+++ b/wwwroot/js/planrecord.js
@@ -69,15 +69,15 @@ function showEditPlanRecordTemplateModal(planRecordTemplateId, nocache) {
 }
 function hideAddPlanRecordModal() {
     $('#planRecordModal').modal('hide');
-    if (getPlanRecordModelData().createdFromReminder) {
-        //show reminder Modal
-        $("#reminderRecordModal").modal("show");
-    }
-    if (getPlanRecordModelData().isTemplate) {
-        showPlanRecordTemplatesModal();
-    }
+        if (getPlanRecordModelData().createdFromReminder) {
+            //show reminder Modal
+            $("#reminderRecordModal").modal("show");
+        }
+        if (getPlanRecordModelData().isTemplate) {
+            showPlanRecordTemplatesModal();
+        }
 }
-function deletePlanRecord(planRecordId) {
+function deletePlanRecord(planRecordId, noModal) {
     $("#workAroundInput").show();
     Swal.fire({
         title: "Confirm Deletion?",
@@ -89,7 +89,9 @@ function deletePlanRecord(planRecordId) {
         if (result.isConfirmed) {
             $.post(`/Vehicle/DeletePlanRecordById?planRecordId=${planRecordId}`, function (data) {
                 if (data) {
-                    hideAddPlanRecordModal();
+                    if (!noModal) {
+                        hideAddPlanRecordModal();
+                    }
                     successToast("Plan Record Deleted");
                     var vehicleId = GetVehicleId().vehicleId;
                     getVehiclePlanRecords(vehicleId);
@@ -166,9 +168,8 @@ function deletePlannerRecordTemplate(planRecordTemplateId) {
             $.post(`/Vehicle/DeletePlanRecordTemplateById?planRecordTemplateId=${planRecordTemplateId}`, function (data) {
                 $("#workAroundInput").hide();
                 if (data) {
-                    successToast("Template Deleted");
+                    successToast("Plan Template Deleted");
                     hideAddPlanRecordModal();
-                    hidePlanRecordTemplatesModal();
                 } else {
                     errorToast(genericErrorMessage());
                 }