diff --git a/packages/pl-fe/src/components/search-input.tsx b/packages/pl-fe/src/components/search-input.tsx
index 7deef416f..988842d9d 100644
--- a/packages/pl-fe/src/components/search-input.tsx
+++ b/packages/pl-fe/src/components/search-input.tsx
@@ -87,7 +87,7 @@ const SearchInput = React.memo(() => {
         />
 
         <button
-          tabIndex={0}
+          tabIndex={hasValue ? 0 : -1}
           className='absolute inset-y-0 right-0 flex cursor-pointer items-center px-3 rtl:left-0 rtl:right-auto'
           onClick={handleClear}
           title={
diff --git a/packages/pl-fe/src/pages/search/search.tsx b/packages/pl-fe/src/pages/search/search.tsx
index d73520c55..3b39dd621 100644
--- a/packages/pl-fe/src/pages/search/search.tsx
+++ b/packages/pl-fe/src/pages/search/search.tsx
@@ -95,7 +95,7 @@ const SearchInput: React.FC<ISearchInput> = ({ className, placeholder, query })
         />
 
         <button
-          tabIndex={0}
+          tabIndex={value ? 0 : -1}
           className='absolute inset-y-0 right-0 flex cursor-pointer items-center px-3 rtl:left-0 rtl:right-auto'
           onClick={handleClick}
           title={