diff --git a/src/components/ProductSelect/ProductSelect.tsx b/src/components/ProductSelect/ProductSelect.tsx
index 9836c73..cb78eda 100644
--- a/src/components/ProductSelect/ProductSelect.tsx
+++ b/src/components/ProductSelect/ProductSelect.tsx
@@ -55,7 +55,9 @@ const ProductSelect: FC<Props> = (props: Props) => {
         const filtered = (options as ComboboxItem[]).filter((option) => {
                 const product = products.find(product => product.id == parseInt(option.value));
                 if (!product) return true;
-                return product.name.toLowerCase().includes(search.toLowerCase()) || product.barcodes.some((value) => value.toLowerCase().includes(search.toLowerCase()));
+                return product.name.toLowerCase().includes(search.toLowerCase()) ||
+                    product.barcodes.some((value) => value.toLowerCase().includes(search.toLowerCase())) ||
+                    product.article?.toLowerCase() === search.toLowerCase();
             }
         );
 
@@ -64,6 +66,7 @@ const ProductSelect: FC<Props> = (props: Props) => {
     };
     return (
         <ObjectSelect
+            limit={products.length > 500 ? 500 : Infinity}
             renderOption={renderOption}
             searchable
             {...restProps}