diff --git a/components/Hero.jsx b/components/Hero.jsx
index 569e2af..6205e19 100644
--- a/components/Hero.jsx
+++ b/components/Hero.jsx
@@ -1,3 +1,5 @@
+import PropertySearchForm from './PropertySearchForm';
+
 const Hero = () => {
   return (
     <section className='bg-blue-700 py-20 mb-4'>
@@ -10,45 +12,7 @@ const Hero = () => {
             Discover the perfect property that suits your needs.
           </p>
         </div>
-        {/* <!-- Form Component --> */}
-        <form className='mt-3 mx-auto max-w-2xl w-full flex flex-col md:flex-row items-center'>
-          <div className='w-full md:w-3/5 md:pr-2 mb-4 md:mb-0'>
-            <label htmlFor='location' className='sr-only'>
-              Location
-            </label>
-            <input
-              type='text'
-              id='location'
-              placeholder='Enter Location or Keyword'
-              className='w-full px-4 py-3 rounded-lg bg-white text-gray-800 focus:outline-none focus:ring focus:ring-blue-500'
-            />
-          </div>
-          <div className='w-full md:w-2/5 md:pl-2'>
-            <label htmlFor='property-type' className='sr-only'>
-              Property Type
-            </label>
-            <select
-              id='property-type'
-              className='w-full px-4 py-3 rounded-lg bg-white text-gray-800 focus:outline-none focus:ring focus:ring-blue-500'
-            >
-              <option value='All'>All</option>
-              <option value='Apartment'>Apartment</option>
-              <option value='Studio'>Studio</option>
-              <option value='Condo'>Condo</option>
-              <option value='House'>House</option>
-              <option value='Cabin Or Cottage'>Cabin or Cottage</option>
-              <option value='Loft'>Loft</option>
-              <option value='Room'>Room</option>
-              <option value='Other'>Other</option>
-            </select>
-          </div>
-          <button
-            type='submit'
-            className='md:ml-4 mt-4 md:mt-0 w-full md:w-auto px-6 py-3 rounded-lg bg-blue-500 text-white hover:bg-blue-600 focus:outline-none focus:ring focus:ring-blue-500'
-          >
-            Search
-          </button>
-        </form>
+        <PropertySearchForm />
       </div>
     </section>
   );
diff --git a/components/PropertySearchForm.jsx b/components/PropertySearchForm.jsx
new file mode 100644
index 0000000..3c27e99
--- /dev/null
+++ b/components/PropertySearchForm.jsx
@@ -0,0 +1,72 @@
+'use client';
+import { useState } from 'react';
+import { useRouter } from 'next/navigation';
+
+const PropertySearchForm = () => {
+  const [location, setLocation] = useState('');
+  const [propertyType, setPropertyType] = useState('All');
+
+  const router = useRouter();
+
+  const handleSubmit = (e) => {
+    e.preventDefault();
+
+    if (location === '' && propertyType === 'All') {
+      router.push('/properties');
+    } else {
+      const query = `?location=${location}&propertyType=${propertyType}`;
+
+      router.push(`/properties/search-results${query}`);
+    }
+  };
+
+  return (
+    <form
+      onSubmit={handleSubmit}
+      className='mt-3 mx-auto max-w-2xl w-full flex flex-col md:flex-row items-center'
+    >
+      <div className='w-full md:w-3/5 md:pr-2 mb-4 md:mb-0'>
+        <label htmlFor='location' className='sr-only'>
+          Location
+        </label>
+        <input
+          type='text'
+          id='location'
+          placeholder='Enter Keywords or Location'
+          className='w-full px-4 py-3 rounded-lg bg-white text-gray-800 focus:outline-none focus:ring focus:ring-blue-500'
+          value={location}
+          onChange={(e) => setLocation(e.target.value)}
+        />
+      </div>
+      <div className='w-full md:w-2/5 md:pl-2'>
+        <label htmlFor='property-type' className='sr-only'>
+          Property Type
+        </label>
+        <select
+          id='property-type'
+          className='w-full px-4 py-3 rounded-lg bg-white text-gray-800 focus:outline-none focus:ring focus:ring-blue-500'
+          value={propertyType}
+          onChange={(e) => setPropertyType(e.target.value)}
+        >
+          <option value='All'>All</option>
+          <option value='Apartment'>Apartment</option>
+          <option value='Studio'>Studio</option>
+          <option value='Condo'>Condo</option>
+          <option value='House'>House</option>
+          <option value='Cabin Or Cottage'>Cabin or Cottage</option>
+          <option value='Loft'>Loft</option>
+          <option value='Room'>Room</option>
+          <option value='Other'>Other</option>
+        </select>
+      </div>
+      <button
+        type='submit'
+        className='md:ml-4 mt-4 md:mt-0 w-full md:w-auto px-6 py-3 rounded-lg bg-blue-500 text-white hover:bg-blue-600 focus:outline-none focus:ring focus:ring-blue-500'
+      >
+        Search
+      </button>
+    </form>
+  );
+};
+
+export default PropertySearchForm;