diff --git a/src/components/Diagnosis/ConditionVerificationStatusMenu.tsx b/src/components/Diagnosis/ConditionVerificationStatusMenu.tsx
index 608e2d06dff..6a06d3d07f3 100644
--- a/src/components/Diagnosis/ConditionVerificationStatusMenu.tsx
+++ b/src/components/Diagnosis/ConditionVerificationStatusMenu.tsx
@@ -1,3 +1,4 @@
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 
 import CareIcon from "@/CAREUI/icons/CareIcon";
@@ -14,6 +15,7 @@ import { classNames } from "@/Utils/utils";
 interface Props<T extends ConditionVerificationStatus> {
   disabled?: boolean;
   value?: T;
+  defaultValue?: T; // Added default value support
   placeholder?: string;
   options: readonly T[];
   onSelect: (option: T) => void;
@@ -26,48 +28,69 @@ export default function ConditionVerificationStatusMenu<
   T extends ConditionVerificationStatus,
 >(props: Props<T>) {
   const { t } = useTranslation();
+  const [searchTerm, setSearchTerm] = useState("");
+  const [selectedValue, setSelectedValue] = useState(props.defaultValue);
+
+  const filteredOptions = props.options.filter((status) =>
+    t(status).toLowerCase().includes(searchTerm.toLowerCase())
+  );
 
   return (
     <DropdownMenu
       size={props.size ?? "small"}
       className={classNames(
         props.className,
-        props.value && StatusStyle[props.value].colors,
-        props.value &&
+        selectedValue && StatusStyle[selectedValue].colors,
+        selectedValue &&
           "border !border-secondary-400 bg-white hover:bg-secondary-300",
       )}
       id="condition-verification-status-menu"
-      title={props.value ? t(props.value) : (props.placeholder ?? t("add_as"))}
+      title={
+        selectedValue
+          ? t(selectedValue)
+          : props.placeholder ?? t("add_as")
+      }
       disabled={props.disabled}
-      variant={props.value ? StatusStyle[props.value].variant : "primary"}
+      variant={selectedValue ? StatusStyle[selectedValue].variant : "primary"}
     >
       <>
-        {props.options.map((status) => (
+        <input
+          type="text"
+          placeholder={t("search")}
+          className="p-2 w-full border-b"
+          value={searchTerm}
+          onChange={(e) => setSearchTerm(e.target.value)}
+        />
+
+        {filteredOptions.map((status) => (
           <DropdownItem
             key={status}
             id={`add-icd11-diagnosis-as-${status}`}
             variant={StatusStyle[status].variant}
-            onClick={() => props.onSelect(status)}
+            onClick={() => {
+              setSelectedValue(status);
+              props.onSelect(status);
+            }}
             icon={
               <CareIcon
                 icon="l-coronavirus"
                 className={classNames(
                   "hidden text-lg transition-all duration-200 ease-in-out group-hover:rotate-90 group-hover:text-inherit md:block",
-                  props.value === status
+                  selectedValue === status
                     ? "text-inherit-500"
                     : "text-secondary-500",
                 )}
               />
             }
             className="group"
-            disabled={props.value === status}
+            disabled={selectedValue === status}
           >
             <div className="flex w-full max-w-xs flex-col items-start gap-1 whitespace-nowrap md:whitespace-normal">
-              <span className={props.value === status ? "font-medium" : ""}>
+              <span className={selectedValue === status ? "font-medium" : ""}>
                 {InactiveConditionVerificationStatuses.includes(
                   status as (typeof InactiveConditionVerificationStatuses)[number],
                 )
-                  ? "Remove as "
+                  ? t("remove_as")
                   : ""}
                 {t(status)}
               </span>
@@ -78,11 +101,14 @@ export default function ConditionVerificationStatusMenu<
           </DropdownItem>
         ))}
 
-        {props.value && props.onRemove && (
+        {selectedValue && props.onRemove && (
           <DropdownItem
             variant="danger"
             id="remove-diagnosis"
-            onClick={() => props.onRemove?.()}
+            onClick={() => {
+              setSelectedValue(undefined);
+              props.onRemove?.();
+            }}
             icon={<CareIcon icon="l-trash-alt" className="text-lg" />}
           >
             {t("remove")}
@@ -96,22 +122,18 @@ export default function ConditionVerificationStatusMenu<
 export const StatusStyle = {
   unconfirmed: {
     variant: "warning",
-    // icon: "l-question",
     colors: "text-yellow-500 border-yellow-500",
   },
   provisional: {
     variant: "warning",
-    // icon: "l-question",
     colors: "text-secondary-800 border-secondary-800",
   },
   differential: {
     variant: "warning",
-    // icon: "l-question",
     colors: "text-secondary-800 border-secondary-800",
   },
   confirmed: {
     variant: "primary",
-    // icon: "l-check",
     colors: "text-primary-500 border-primary-500",
   },
   refuted: {
@@ -121,7 +143,6 @@ export const StatusStyle = {
   },
   "entered-in-error": {
     variant: "danger",
-    // icon: "l-ban",
     colors: "text-danger-500 border-danger-500",
   },
 } as const;