diff --git a/packages/ui/src/components/TextInput/TextInput.tsx b/packages/ui/src/components/TextInput/TextInput.tsx
index b651c852d..7bfe5b3f7 100644
--- a/packages/ui/src/components/TextInput/TextInput.tsx
+++ b/packages/ui/src/components/TextInput/TextInput.tsx
@@ -46,6 +46,7 @@ export interface TextInputProps extends Omit<ComponentProps<"input">, "ref" | "c
   color?: DynamicStringEnumKeysOf<FlowbiteTextInputColors>;
   helperText?: ReactNode;
   icon?: FC<ComponentProps<"svg">>;
+  onRightIconClick?: (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
   rightIcon?: FC<ComponentProps<"svg">>;
   shadow?: boolean;
   sizing?: DynamicStringEnumKeysOf<FlowbiteTextInputSizes>;
@@ -60,6 +61,7 @@ export const TextInput = forwardRef<HTMLInputElement, TextInputProps>(
       color = "gray",
       helperText,
       icon: Icon,
+      onRightIconClick,
       rightIcon: RightIcon,
       shadow,
       sizing = "md",
@@ -82,7 +84,11 @@ export const TextInput = forwardRef<HTMLInputElement, TextInputProps>(
               </div>
             )}
             {RightIcon && (
-              <div data-testid="right-icon" className={theme.field.rightIcon.base}>
+              <div
+                data-testid="right-icon"
+                className={`${theme.field.rightIcon.base} ${!onRightIconClick ? "pointer-events-none" : ""}`}
+                onClick={onRightIconClick}
+              >
                 <RightIcon className={theme.field.rightIcon.svg} />
               </div>
             )}
diff --git a/packages/ui/src/components/TextInput/theme.ts b/packages/ui/src/components/TextInput/theme.ts
index 15b9f7003..aa5c41100 100644
--- a/packages/ui/src/components/TextInput/theme.ts
+++ b/packages/ui/src/components/TextInput/theme.ts
@@ -12,7 +12,7 @@ export const textInputTheme: FlowbiteTextInputTheme = createTheme({
       svg: "h-5 w-5 text-gray-500 dark:text-gray-400",
     },
     rightIcon: {
-      base: "pointer-events-none absolute inset-y-0 right-0 flex items-center pr-3",
+      base: "absolute inset-y-0 right-0 flex items-center pr-3",
       svg: "h-5 w-5 text-gray-500 dark:text-gray-400",
     },
     input: {