diff --git a/frontend/src/components/Input.tsx b/frontend/src/components/Input.tsx
index e703ff14..247446ef 100644
--- a/frontend/src/components/Input.tsx
+++ b/frontend/src/components/Input.tsx
@@ -1,4 +1,5 @@
 import { InputProps } from './types';
+import { useRef } from 'react';
 
 const Input = ({
   id,
@@ -27,15 +28,19 @@ const Input = ({
     thin: 'border',
     thick: 'border-2',
   };
+
+  const inputRef = useRef<HTMLInputElement>(null);
+
   return (
     <div className="relative">
       <input
-        className={`h-[42px] w-full rounded-full px-3 py-1 outline-none dark:bg-transparent dark:text-white ${className} ${colorStyles[colorVariant]} ${borderStyles[borderVariant]}`}
+        ref={inputRef}
+        className={`peer h-[42px] w-full rounded-full px-3 py-1 outline-none dark:bg-transparent dark:text-white placeholder-transparent ${className} ${colorStyles[colorVariant]} ${borderStyles[borderVariant]}`}
         type={type}
         id={id}
         name={name}
         autoFocus={isAutoFocused}
-        placeholder={placeholder}
+        placeholder={placeholder || label || ''}
         maxLength={maxLength}
         value={value}
         onChange={onChange}
@@ -45,17 +50,21 @@ const Input = ({
       >
         {children}
       </input>
-      {label && (
-        <div className="absolute -top-2 left-2">
-          <span className="bg-white px-2 text-xs text-gray-4000 dark:bg-[#26272E] dark:text-silver flex items-center">
-            {label}
-            {required && (
-              <span className="text-[#D30000] dark:text-[#D42626] ml-0.5">
-                *
-              </span>
-            )}
-          </span>
-        </div>
+      {(label || placeholder) && (
+        <label
+          htmlFor={id}
+          className={`absolute left-3 -top-2.5 bg-white px-2 text-xs transition-all
+            peer-placeholder-shown:top-2.5 peer-placeholder-shown:left-3 
+            peer-placeholder-shown:text-base peer-placeholder-shown:text-gray-4000
+            peer-focus:-top-2.5 peer-focus:left-3 peer-focus:text-xs peer-focus:text-gray-4000
+            dark:bg-[#26272E] dark:text-silver dark:peer-placeholder-shown:text-gray-400
+            cursor-none pointer-events-none`}
+        >
+          {label || placeholder}
+          {required && (
+            <span className="text-[#D30000] dark:text-[#D42626] ml-0.5">*</span>
+          )}
+        </label>
       )}
     </div>
   );