diff --git a/changelog/62_UNRELEASED_xxxx-xx-xx.md b/changelog/62_UNRELEASED_xxxx-xx-xx.md
index d4da186d..68412c81 100644
--- a/changelog/62_UNRELEASED_xxxx-xx-xx.md
+++ b/changelog/62_UNRELEASED_xxxx-xx-xx.md
@@ -27,6 +27,7 @@
 
 ### Stock improvements/fixes
 - Product barcodes are now enforced to be unique across products
+- On the stock overview page it's now also possible to search/filter by product barcodes (via the general search field)
 - Fixed that editing stock entries was not possible
 - Fixed that consuming with Scan Mode was not possible
 - Fixed that the current stock total value (header of the stock overview page) didn't include decimal amounts (thanks @Ape)
diff --git a/migrations/0136.sql b/migrations/0136.sql
new file mode 100644
index 00000000..3be82755
--- /dev/null
+++ b/migrations/0136.sql
@@ -0,0 +1,101 @@
+DROP VIEW uihelper_stock_current_overview_including_opened;
+CREATE VIEW uihelper_stock_current_overview_including_opened
+AS
+SELECT
+    p.id,
+    sc.amount_opened AS amount_opened,
+    p.tare_weight AS tare_weight,
+    p.enable_tare_weight_handling AS enable_tare_weight_handling,
+    sc.amount AS amount,
+    sc.value as value,
+    sc.product_id AS product_id,
+    sc.best_before_date AS best_before_date,
+    EXISTS(SELECT id FROM stock_missing_products_including_opened WHERE id = sc.product_id) AS product_missing,
+    (SELECT name FROM quantity_units WHERE quantity_units.id = p.qu_id_stock) AS qu_unit_name,
+    (SELECT name_plural FROM quantity_units WHERE quantity_units.id = p.qu_id_stock) AS qu_unit_name_plural,
+    p.name AS product_name,
+    (SELECT name FROM product_groups WHERE product_groups.id = product_group_id) AS product_group_name,
+    EXISTS(SELECT * FROM shopping_list WHERE shopping_list.product_id = sc.product_id) AS on_shopping_list,
+    (SELECT name FROM quantity_units WHERE quantity_units.id = p.qu_id_purchase) AS qu_purchase_unit_name,
+    (SELECT name_plural FROM quantity_units WHERE quantity_units.id = p.qu_id_purchase) AS qu_purchase_unit_name_plural,
+    sc.is_aggregated_amount,
+    sc.amount_opened_aggregated,
+    sc.amount_aggregated,
+	p.calories AS product_calories,
+	sc.amount * p.calories AS calories,
+	sc.amount_aggregated * p.calories AS calories_aggregated,
+	p.quick_consume_amount,
+	p.due_type,
+	plp.purchased_date AS last_purchased,
+	plp.price AS last_price,
+	p.min_stock_amount,
+	pbcs.barcodes AS product_barcodes
+FROM (
+	SELECT *
+	FROM stock_current
+	WHERE best_before_date IS NOT NULL
+	UNION
+	SELECT m.id, 0, 0, 0, null, 0, 0, 0, p.due_type
+	FROM stock_missing_products_including_opened m
+	JOIN products p
+		ON m.id = p.id
+	WHERE m.id NOT IN (SELECT product_id FROM stock_current)
+    ) sc
+LEFT JOIN products_last_purchased plp
+	ON sc.product_id = plp.product_id
+LEFT JOIN products p
+    ON sc.product_id = p.id
+LEFT JOIN product_barcodes_comma_separated pbcs
+	ON sc.product_id = pbcs.product_id
+WHERE p.hide_on_stock_overview = 0;
+
+DROP VIEW uihelper_stock_current_overview;
+CREATE VIEW uihelper_stock_current_overview
+AS
+SELECT
+    p.id,
+    sc.amount_opened AS amount_opened,
+    p.tare_weight AS tare_weight,
+    p.enable_tare_weight_handling AS enable_tare_weight_handling,
+    sc.amount AS amount,
+    sc.value as value,
+    sc.product_id AS product_id,
+    sc.best_before_date AS best_before_date,
+    EXISTS(SELECT id FROM stock_missing_products WHERE id = sc.product_id) AS product_missing,
+    (SELECT name FROM quantity_units WHERE quantity_units.id = p.qu_id_stock) AS qu_unit_name,
+    (SELECT name_plural FROM quantity_units WHERE quantity_units.id = p.qu_id_stock) AS qu_unit_name_plural,
+    p.name AS product_name,
+    (SELECT name FROM product_groups WHERE product_groups.id = product_group_id) AS product_group_name,
+    EXISTS(SELECT * FROM shopping_list WHERE shopping_list.product_id = sc.product_id) AS on_shopping_list,
+    (SELECT name FROM quantity_units WHERE quantity_units.id = p.qu_id_purchase) AS qu_purchase_unit_name,
+    (SELECT name_plural FROM quantity_units WHERE quantity_units.id = p.qu_id_purchase) AS qu_purchase_unit_name_plural,
+    sc.is_aggregated_amount,
+    sc.amount_opened_aggregated,
+    sc.amount_aggregated,
+	p.calories AS product_calories,
+	sc.amount * p.calories AS calories,
+	sc.amount_aggregated * p.calories AS calories_aggregated,
+	p.quick_consume_amount,
+	p.due_type,
+	plp.purchased_date AS last_purchased,
+	plp.price AS last_price,
+	p.min_stock_amount,
+	pbcs.barcodes AS product_barcodes
+FROM (
+	SELECT *
+	FROM stock_current
+	WHERE best_before_date IS NOT NULL
+	UNION
+	SELECT m.id, 0, 0, 0, null, 0, 0, 0, p.due_type
+	FROM stock_missing_products m
+	JOIN products p
+		ON m.id = p.id
+	WHERE m.id NOT IN (SELECT product_id FROM stock_current)
+    ) sc
+LEFT JOIN products_last_purchased plp
+	ON sc.product_id = plp.product_id
+LEFT JOIN products p
+    ON sc.product_id = p.id
+LEFT JOIN product_barcodes_comma_separated pbcs
+	ON sc.product_id = pbcs.product_id
+WHERE p.hide_on_stock_overview = 0;
diff --git a/views/stockoverview.blade.php b/views/stockoverview.blade.php
index 7ae912b7..e0caebc0 100755
--- a/views/stockoverview.blade.php
+++ b/views/stockoverview.blade.php
@@ -318,6 +318,7 @@
 					<td class="product-name-cell cursor-link"
 						data-product-id="{{ $currentStockEntry->product_id }}">
 						{{ $currentStockEntry->product_name }}
+						<span class="d-none">{{ $currentStockEntry->product_barcodes }}</span>
 					</td>
 					<td>
 						@if($currentStockEntry->product_group_name !== null){{ $currentStockEntry->product_group_name }}@endif