diff --git a/teachertool/src/components/CriteriaResultEntry.tsx b/teachertool/src/components/CriteriaResultEntry.tsx
index 8aef5ccb998a..17f0ac761444 100644
--- a/teachertool/src/components/CriteriaResultEntry.tsx
+++ b/teachertool/src/components/CriteriaResultEntry.tsx
@@ -18,6 +18,9 @@ import { Button } from "react-common/components/controls/Button";
 import { setEvalResult } from "../transforms/setEvalResult";
 import { showToast } from "../transforms/showToast";
 import { makeToast } from "../utils";
+import { reAddCriteriaToChecklist } from "../transforms/reAddCriteriaToChecklist";
+import { dismissToast } from "../state/actions";
+import { softDeleteCriteriaFromChecklist } from "../transforms/softDeleteCriteriaFromChecklist";
 
 interface CriteriaResultNotesProps {
     criteriaId: string;
@@ -76,6 +79,25 @@ const CriteriaResultError: React.FC<CriteriaResultErrorProps> = ({ criteriaInsta
     );
 };
 
+const UndoDeleteCriteriaButton: React.FC<{ criteriaId: string, toastId: string }> = ({ criteriaId, toastId }) => {
+    const { dispatch } = useContext(AppStateContext);
+    const handleUndoClicked = () => {
+        reAddCriteriaToChecklist(criteriaId);
+        if (toastId) {
+            dispatch(dismissToast(toastId));
+        }
+    }
+
+    return (
+        <Button
+            className="undo-button"
+            title={Strings.Undo}
+            label={Strings.Undo}
+            onClick={handleUndoClicked}
+        />
+    )
+}
+
 const CriteriaResultToolbarTray: React.FC<{ criteriaId: string }> = ({ criteriaId }) => {
     const { state: teacherTool } = useContext(AppStateContext);
 
@@ -91,9 +113,14 @@ const CriteriaResultToolbarTray: React.FC<{ criteriaId: string }> = ({ criteriaI
     }
 
     async function handleDeleteClickedAsync() {
-        if (confirm(Strings.ConfirmDeleteCriteriaInstance)) {
+        const toastTimeout = 5000;
+        softDeleteCriteriaFromChecklist(criteriaId);
+        const toast = makeToast("info", Strings.CriteriaDeleted, toastTimeout);
+        toast.jsx = <UndoDeleteCriteriaButton criteriaId={criteriaId} toastId={toast.id} />;
+        showToast(toast);
+        setTimeout(() => {
             removeCriteriaFromChecklist(criteriaId);
-        }
+        }, toastTimeout + 500);
     }
 
     return (
diff --git a/teachertool/src/components/EvalResultDisplay.tsx b/teachertool/src/components/EvalResultDisplay.tsx
index 84bd2cf4077a..7edbaea8e4aa 100644
--- a/teachertool/src/components/EvalResultDisplay.tsx
+++ b/teachertool/src/components/EvalResultDisplay.tsx
@@ -13,10 +13,9 @@ import { setChecklistName } from "../transforms/setChecklistName";
 import { Strings, Ticks } from "../constants";
 import { Button } from "react-common/components/controls/Button";
 import { runEvaluateAsync } from "../transforms/runEvaluateAsync";
-import { isProjectLoaded } from "../state/helpers";
 import { showToast } from "../state/actions";
 import { makeToast } from "../utils";
-import { getSafeChecklistName } from "../state/helpers";
+import { isProjectLoaded, getSafeChecklistName, getActiveCriteria } from "../state/helpers";
 import { writeChecklistToFile } from "../services/fileSystemService";
 
 interface ResultsHeaderProps {
@@ -27,6 +26,7 @@ const ResultsHeader: React.FC<ResultsHeaderProps> = ({ printRef }) => {
     const { state: teacherTool } = useContext(AppStateContext);
     const { checklist, projectMetadata } = teacherTool;
     let { name: checklistName } = checklist;
+    const criteriaToExport = getActiveCriteria(teacherTool);
     const [checklistNameInputRef, setChecklistNameInputRef] = useState<HTMLInputElement>();
 
     const handleEvaluateClickedAsync = async () => {
@@ -49,7 +49,7 @@ const ResultsHeader: React.FC<ResultsHeaderProps> = ({ printRef }) => {
 
     const handleExportChecklistClicked = () => {
         pxt.tickEvent(Ticks.ExportChecklist);
-        writeChecklistToFile(checklist);
+        writeChecklistToFile({ name: checklistName, criteria: criteriaToExport });
     };
 
     return (
@@ -115,8 +115,7 @@ const ResultsHeader: React.FC<ResultsHeaderProps> = ({ printRef }) => {
 
 const CriteriaWithResultsTable: React.FC = () => {
     const { state: teacherTool } = useContext(AppStateContext);
-    const { checklist } = teacherTool;
-    const { criteria } = checklist;
+    const criteria = getActiveCriteria(teacherTool);
 
     return (
         <div className={css["results-list"]}>
diff --git a/teachertool/src/components/Toasts.tsx b/teachertool/src/components/Toasts.tsx
index a57d8ad5e464..520030dcbb9e 100644
--- a/teachertool/src/components/Toasts.tsx
+++ b/teachertool/src/components/Toasts.tsx
@@ -54,7 +54,7 @@ const ToastNotification: React.FC<IToastNotificationProps> = ({ toast }) => {
                 <div className={css["text-container"]}>
                     {toast.text && <div className={classList(css["text"], "tt-toast-text")}>{toast.text}</div>}
                     {toast.detail && <div className={css["detail"]}>{toast.detail}</div>}
-                    {toast.jsx && <div>{toast.jsx}</div>}
+                    {toast.jsx && <div className={css["custom-jsx"]}>{toast.jsx}</div>}
                 </div>
                 {!toast.hideDismissBtn && !toast.showSpinner && (
                     <div className={css["dismiss-btn"]} onClick={handleDismissClicked}>
diff --git a/teachertool/src/components/styling/Toasts.module.scss b/teachertool/src/components/styling/Toasts.module.scss
index 968db5dff6ac..8d711adfc6a9 100644
--- a/teachertool/src/components/styling/Toasts.module.scss
+++ b/teachertool/src/components/styling/Toasts.module.scss
@@ -43,6 +43,7 @@
         gap: 0.5rem;
         padding: 0.75rem;
         font-size: 1.125rem;
+        align-items: center;
 
         .icon-container {
             display: flex;
@@ -72,7 +73,8 @@
 
         .text-container {
             display: flex;
-            flex-direction: column;
+            flex-direction: row;
+            align-items: center;
             text-align: left;
 
             .text {
@@ -85,6 +87,11 @@
             .detail {
                 font-size: 0.875rem;
             }
+
+            .custom-jsx {
+                pointer-events: auto;
+                margin-left: 1rem;
+            }
         }
 
         .dismiss-btn {
diff --git a/teachertool/src/constants.ts b/teachertool/src/constants.ts
index 3e8155896e94..3355474ee9a6 100644
--- a/teachertool/src/constants.ts
+++ b/teachertool/src/constants.ts
@@ -53,6 +53,8 @@ export namespace Strings {
     export const EvaluationComplete = lf("Evaluation complete");
     export const UnableToEvaluatePartial = lf("Unable to evaluate some criteria");
     export const GiveFeedback = lf("Give Feedback");
+    export const CriteriaDeleted = lf("Criteria Deleted");
+    export const Undo = lf("Undo");
 }
 
 export namespace Ticks {
diff --git a/teachertool/src/state/helpers.ts b/teachertool/src/state/helpers.ts
index 61e14759e06e..38ce83bf9b30 100644
--- a/teachertool/src/state/helpers.ts
+++ b/teachertool/src/state/helpers.ts
@@ -11,6 +11,10 @@ export function getCatalogCriteriaWithId(id: string): CatalogCriteria | undefine
     return state.catalog?.find(c => c.id === id);
 }
 
+export function getActiveCriteria(state: AppState): CriteriaInstance[] {
+    return state.checklist.criteria.filter(c => !c.deleted);
+}
+
 export function getCriteriaInstanceWithId(state: AppState, id: string): CriteriaInstance | undefined {
     return state.checklist.criteria.find(c => c.instanceId === id);
 }
diff --git a/teachertool/src/style.overrides/Button.scss b/teachertool/src/style.overrides/Button.scss
index ec33f90dfaaf..162bca791057 100644
--- a/teachertool/src/style.overrides/Button.scss
+++ b/teachertool/src/style.overrides/Button.scss
@@ -75,3 +75,14 @@
 .pass > .common-button.common-dropdown-button {
     border: 3px solid var(--pxt-success-accent);
 }
+
+.undo-button {
+    width: 3rem;
+    height: 2rem;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    background-color: var(--pxt-info-accent-darkened);
+    color: var(--pxt-button-secondary-foreground);
+}
\ No newline at end of file
diff --git a/teachertool/src/transforms/reAddCriteriaToChecklist.ts b/teachertool/src/transforms/reAddCriteriaToChecklist.ts
new file mode 100644
index 000000000000..67e24780a2d3
--- /dev/null
+++ b/teachertool/src/transforms/reAddCriteriaToChecklist.ts
@@ -0,0 +1,28 @@
+import { stateAndDispatch } from "../state";
+import { logDebug } from "../services/loggingService";
+import { setChecklist } from "./setChecklist";
+import { Ticks } from "../constants";
+import { getCriteriaInstanceWithId } from "../state/helpers";
+
+export function reAddCriteriaToChecklist(criteriaInstanceId: string) {
+    const { state: teacherTool } = stateAndDispatch();
+
+    logDebug(`Re-adding criteria with id: ${criteriaInstanceId}`);
+
+    const instance = getCriteriaInstanceWithId(teacherTool, criteriaInstanceId);
+    const catalogCriteriaId = instance?.catalogCriteriaId;
+    const allCriteria = [...teacherTool.checklist.criteria];
+    const criteriaIndex = allCriteria.findIndex(c => c.instanceId === criteriaInstanceId);
+    allCriteria[criteriaIndex].deleted = false;
+
+    const newChecklist = {
+        ...teacherTool.checklist,
+        criteria: allCriteria,
+    };
+
+    setChecklist(newChecklist);
+
+    if (catalogCriteriaId) {
+        pxt.tickEvent(Ticks.RemoveCriteria, { catalogCriteriaId });
+    }
+}
diff --git a/teachertool/src/transforms/removeCriteriaFromChecklist.ts b/teachertool/src/transforms/removeCriteriaFromChecklist.ts
index aa2a5cbf43ff..f1439890d8dd 100644
--- a/teachertool/src/transforms/removeCriteriaFromChecklist.ts
+++ b/teachertool/src/transforms/removeCriteriaFromChecklist.ts
@@ -14,7 +14,10 @@ export function removeCriteriaFromChecklist(criteriaInstanceId: string) {
 
     const newChecklist = {
         ...teacherTool.checklist,
-        criteria: teacherTool.checklist.criteria.filter(c => c.instanceId !== criteriaInstanceId),
+        criteria: teacherTool.checklist.criteria.filter(c =>
+            c.instanceId !== criteriaInstanceId ||
+            c.instanceId === criteriaInstanceId && !c.deleted
+        ),
     };
 
     setChecklist(newChecklist);
diff --git a/teachertool/src/transforms/runEvaluateAsync.ts b/teachertool/src/transforms/runEvaluateAsync.ts
index c49b10707f30..3ff314bc2029 100644
--- a/teachertool/src/transforms/runEvaluateAsync.ts
+++ b/teachertool/src/transforms/runEvaluateAsync.ts
@@ -4,6 +4,7 @@ import { showToast } from "./showToast";
 import { setActiveTab } from "./setActiveTab";
 import { runSingleEvaluateAsync } from "./runSingleEvaluateAsync";
 import { Strings } from "../constants";
+import { getActiveCriteria } from "../state/helpers";
 
 export async function runEvaluateAsync(fromUserInteraction: boolean) {
     const { state: teacherTool } = stateAndDispatch();
@@ -17,7 +18,9 @@ export async function runEvaluateAsync(fromUserInteraction: boolean) {
         setActiveTab("results");
     }
 
-    const evalRequests = teacherTool.checklist.criteria.map(criteriaInstance =>
+    const activeCriteria = getActiveCriteria(teacherTool);
+
+    const evalRequests = activeCriteria.map(criteriaInstance =>
         runSingleEvaluateAsync(criteriaInstance.instanceId, fromUserInteraction)
     );
 
diff --git a/teachertool/src/transforms/softDeleteCriteriaFromChecklist.ts b/teachertool/src/transforms/softDeleteCriteriaFromChecklist.ts
new file mode 100644
index 000000000000..dc56e5419734
--- /dev/null
+++ b/teachertool/src/transforms/softDeleteCriteriaFromChecklist.ts
@@ -0,0 +1,29 @@
+import { stateAndDispatch } from "../state";
+import { logDebug } from "../services/loggingService";
+import { setChecklist } from "./setChecklist";
+import { Ticks } from "../constants";
+import { getCriteriaInstanceWithId } from "../state/helpers";
+
+export function softDeleteCriteriaFromChecklist(criteriaInstanceId: string) {
+    const { state: teacherTool } = stateAndDispatch();
+
+    logDebug(`Soft deleting criteria with id: ${criteriaInstanceId}`);
+
+    const instance = getCriteriaInstanceWithId(teacherTool, criteriaInstanceId);
+    const catalogCriteriaId = instance?.catalogCriteriaId;
+    const allCriteria = [...teacherTool.checklist.criteria];
+    const criteriaIndex = allCriteria.findIndex(c => c.instanceId === criteriaInstanceId);
+    allCriteria[criteriaIndex].deleted = true;
+
+
+    const newChecklist = {
+        ...teacherTool.checklist,
+        criteria: allCriteria,
+    };
+
+    setChecklist(newChecklist);
+
+    if (catalogCriteriaId) {
+        pxt.tickEvent(Ticks.RemoveCriteria, { catalogCriteriaId });
+    }
+}
diff --git a/teachertool/src/types/criteria.ts b/teachertool/src/types/criteria.ts
index 80c3422faa9f..656d65521b65 100644
--- a/teachertool/src/types/criteria.ts
+++ b/teachertool/src/types/criteria.ts
@@ -20,6 +20,7 @@ export interface CriteriaInstance {
     instanceId: string;
     params: CriteriaParameterValue[] | undefined;
     userFeedback?: UserFeedback;
+    deleted?: boolean;
 }
 
 // Represents a parameter definition in a catalog criteria.