diff --git a/src/app/(client-components)/(HeroSearchForm)/(real-estate-search-form)/PropertyTypeSelect.tsx b/src/app/(client-components)/(HeroSearchForm)/(real-estate-search-form)/PropertyTypeSelect.tsx
new file mode 100644
index 0000000..055d3cc
--- /dev/null
+++ b/src/app/(client-components)/(HeroSearchForm)/(real-estate-search-form)/PropertyTypeSelect.tsx
@@ -0,0 +1,126 @@
+"use client";
+import React, { Fragment, FC } from "react";
+import { Popover, Transition } from "@headlessui/react";
+import Checkbox from "@/shared/Checkbox";
+import { ClassOfProperties } from "../../type";
+import { HomeIcon } from "@heroicons/react/24/outline";
+
+const defaultPropertyType: ClassOfProperties[] = [
+  {
+    name: "Duplex House",
+    description: "Have a place to yourself",
+    checked: true,
+  },
+  {
+    name: "Ferme House",
+    description: "Have your own room and share some common spaces",
+    checked: false,
+  },
+  {
+    name: "Chalet House",
+    description:
+      "Have a private or shared room in a boutique hotel, hostel, and more",
+    checked: false,
+  },
+  {
+    name: "Maison House",
+    description: "Stay in a shared space, like a common room",
+    checked: false,
+  },
+];
+
+export interface PropertyTypeSelectProps {
+  onChange?: (data: any) => void;
+  fieldClassName?: string;
+}
+
+const PropertyTypeSelect: FC<PropertyTypeSelectProps> = ({
+  onChange,
+  fieldClassName = "[ nc-hero-field-padding ]",
+}) => {
+  const [typeOfProperty, setTypeOfProperty] =
+    React.useState<ClassOfProperties[]>(defaultPropertyType);
+
+  let typeOfPropertyText = "";
+  if (typeOfProperty && typeOfProperty.length > 0) {
+    typeOfPropertyText = typeOfProperty
+      .filter((item) => item.checked)
+      .map((item) => {
+        return item.name;
+      })
+      .join(", ");
+  }
+  return (
+    <Popover className="flex relative flex-1">
+      {({ open, close }) => (
+        <>
+          <Popover.Button
+            className={`flex z-10 text-left w-full flex-shrink-0 items-center ${fieldClassName} space-x-3 focus:outline-none cursor-pointer ${
+              open ? "nc-hero-field-focused" : ""
+            }`}
+            onClickCapture={() => document.querySelector("html")?.click()}
+          >
+            <div className="text-neutral-300 dark:text-neutral-400">
+              <HomeIcon className="w-5 h-5 lg:w-7 lg:h-7" />
+            </div>
+            <div className="flex-1">
+              <span className="block xl:text-lg font-semibold overflow-hidden">
+                <span className="line-clamp-1">
+                  {typeOfPropertyText || `Type`}
+                </span>
+              </span>
+              <span className="block mt-1 text-sm text-neutral-400 leading-none font-light ">
+                Property type
+              </span>
+            </div>
+          </Popover.Button>
+
+          {open && (
+            <div className="h-8 absolute self-center top-1/2 -translate-y-1/2 z-0 -inset-x-0.5 bg-white dark:bg-neutral-800"></div>
+          )}
+
+          <Transition
+            as={Fragment}
+            enter="transition ease-out duration-200"
+            enterFrom="opacity-0 translate-y-1"
+            enterTo="opacity-100 translate-y-0"
+            leave="transition ease-in duration-150"
+            leaveFrom="opacity-100 translate-y-0"
+            leaveTo="opacity-0 translate-y-1"
+          >
+            <Popover.Panel className="absolute left-0 z-10 w-full sm:min-w-[340px] max-w-sm bg-white dark:bg-neutral-800 top-full mt-3 py-5 sm:py-6 px-4 sm:px-8 rounded-3xl shadow-xl">
+              <div className="">
+                <div className="relative flex flex-col space-y-5">
+                  {typeOfProperty.map((item, index) => (
+                    <div key={item.name} className="">
+                      <Checkbox
+                        name={item.name}
+                        label={item.name}
+                        subLabel={item.description}
+                        defaultChecked={typeOfProperty[index].checked}
+                        onChange={(e) => {
+                          const newState = typeOfProperty.map((item, i) => {
+                            if (i === index) {
+                              return { ...item, checked: e };
+                            }
+                            return item;
+                          });
+                          setTypeOfProperty(() => {
+                            return newState;
+                          });
+                          onChange && onChange(newState);
+                        }}
+                      />
+                    </div>
+                  ))}
+                </div>
+              </div>
+            </Popover.Panel>
+          </Transition>
+        </>
+      )}
+    </Popover>
+  );
+};
+
+export default PropertyTypeSelect;