diff --git a/joi/src/core/Input/index.tsx b/joi/src/core/Input/index.tsx
index d82099e9c..99b7fe8ab 100644
--- a/joi/src/core/Input/index.tsx
+++ b/joi/src/core/Input/index.tsx
@@ -2,17 +2,30 @@ import React, { ReactNode, forwardRef } from 'react'
 import { twMerge } from 'tailwind-merge'
 
 import './styles.scss'
+import { Cross2Icon } from '@radix-ui/react-icons'
 
 export interface Props extends React.InputHTMLAttributes<HTMLInputElement> {
   textAlign?: 'left' | 'right'
   prefixIcon?: ReactNode
   suffixIcon?: ReactNode
   onCLick?: () => void
+  clearable?: boolean
+  onClear?: () => void
 }
 
 const Input = forwardRef<HTMLInputElement, Props>(
   (
-    { className, type, textAlign, prefixIcon, suffixIcon, onClick, ...props },
+    {
+      className,
+      type,
+      textAlign,
+      prefixIcon,
+      suffixIcon,
+      onClick,
+      onClear,
+      clearable,
+      ...props
+    },
     ref
   ) => {
     return (
@@ -27,6 +40,11 @@ const Input = forwardRef<HTMLInputElement, Props>(
             {suffixIcon}
           </div>
         )}
+        {clearable && (
+          <div className="input__clear-icon" onClick={onClear}>
+            <Cross2Icon className="text-red-200" />
+          </div>
+        )}
         <input
           type={type}
           className={twMerge(
diff --git a/joi/src/core/Input/styles.scss b/joi/src/core/Input/styles.scss
index a6226fa06..540d880b1 100644
--- a/joi/src/core/Input/styles.scss
+++ b/joi/src/core/Input/styles.scss
@@ -40,4 +40,11 @@
       padding-right: 32px;
     }
   }
+  &__clear-icon {
+    @apply absolute right-3 top-1/2 -translate-y-1/2 cursor-pointer;
+    color: hsla(var(--input-icon));
+    + .input {
+      padding: 0 32px;
+    }
+  }
 }
diff --git a/web/containers/ModelSearch/index.tsx b/web/containers/ModelSearch/index.tsx
index 9413030f4..10b6466a6 100644
--- a/web/containers/ModelSearch/index.tsx
+++ b/web/containers/ModelSearch/index.tsx
@@ -64,6 +64,11 @@ const ModelSearch = ({ onSearchLocal }: Props) => {
     [debounced]
   )
 
+  const onClear = useCallback(() => {
+    setSearchText('')
+    debounced()
+  }, [debounced])
+
   const onKeyDown = useCallback(
     (e: React.KeyboardEvent<HTMLInputElement>) => {
       if (e.key === 'Enter' && !e.shiftKey && !e.nativeEvent.isComposing) {
@@ -80,6 +85,9 @@ const ModelSearch = ({ onSearchLocal }: Props) => {
       placeholder="Search or paste Hugging Face URL"
       onChange={onSearchChanged}
       onKeyDown={onKeyDown}
+      value={searchText}
+      clearable={searchText.length > 0}
+      onClear={onClear}
     />
   )
 }
diff --git a/web/screens/Settings/CoreExtensions/index.tsx b/web/screens/Settings/CoreExtensions/index.tsx
index b3b988c66..65bc74ba8 100644
--- a/web/screens/Settings/CoreExtensions/index.tsx
+++ b/web/screens/Settings/CoreExtensions/index.tsx
@@ -138,7 +138,10 @@ const ExtensionCatalog = () => {
             <Input
               prefixIcon={<SearchIcon size={16} />}
               placeholder="Search"
+              value={searchText}
               onChange={(e) => setSearchText(e.target.value)}
+              clearable={searchText.length > 0}
+              onClear={() => setSearchText('')}
             />
           </div>
           <div>