diff --git a/controllers/StockController.php b/controllers/StockController.php
index 3224fe07..a602c9f5 100644
--- a/controllers/StockController.php
+++ b/controllers/StockController.php
@@ -92,7 +92,8 @@ class StockController extends BaseController
 	public function ProductGroupsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		return $this->AppContainer->view->render($response, 'productgroups', [
-			'productGroups' => $this->Database->product_groups()->orderBy('name')
+			'productGroups' => $this->Database->product_groups()->orderBy('name'),
+			'products' => $this->Database->products()->orderBy('name')
 		]);
 	}
 
diff --git a/public/viewjs/products.js b/public/viewjs/products.js
index 41c32a86..57377541 100644
--- a/public/viewjs/products.js
+++ b/public/viewjs/products.js
@@ -32,6 +32,23 @@ $("#search").on("keyup", function()
 	productsTable.search(value).draw();
 });
 
+$("#product-group-filter").on("change", function()
+{
+	var value = $("#product-group-filter option:selected").text();
+	if (value === L("All"))
+	{
+		value = "";
+	}
+
+	productsTable.column(7).search(value).draw();
+});
+
+if (typeof GetUriParam("product-group") !== "undefined")
+{
+	$("#product-group-filter").val(GetUriParam("product-group"));
+	$("#product-group-filter").trigger("change");
+}
+
 $(document).on('click', '.product-delete-button', function (e)
 {
 	var objectName = $(e.currentTarget).attr('data-product-name');
diff --git a/views/productgroups.blade.php b/views/productgroups.blade.php
index b6b25822..c37d4339 100644
--- a/views/productgroups.blade.php
+++ b/views/productgroups.blade.php
@@ -31,6 +31,7 @@
 					<th class="border-right"></th>
 					<th>{{ $L('Name') }}</th>
 					<th>{{ $L('Description') }}</th>
+					<th>{{ $L('Product count') }}</th>
 				</tr>
 			</thead>
 			<tbody class="d-none">
@@ -50,6 +51,12 @@
 					<td>
 						{{ $productGroup->description }}
 					</td>
+					<td>
+						{{ count(FindAllObjectsInArrayByPropertyValue($products, 'product_group_id', $productGroup->id)) }}
+						<a class="btn btn-link btn-sm text-body" href="{{ $U('/products?product-group=') . $productGroup->id }}">
+						<i class="fas fa-external-link-alt"></i>
+						</a>
+					</td>
 				</tr>
 				@endforeach
 			</tbody>
diff --git a/views/products.blade.php b/views/products.blade.php
index 964af289..fa2c74c9 100644
--- a/views/products.blade.php
+++ b/views/products.blade.php
@@ -24,6 +24,15 @@
 		<label for="search">{{ $L('Search') }}</label> <i class="fas fa-search"></i>
 		<input type="text" class="form-control" id="search">
 	</div>
+	<div class="col-xs-12 col-md-6 col-xl-3">
+		<label for="location-filter">{{ $L('Filter by product group') }}</label> <i class="fas fa-filter"></i>
+		<select class="form-control" id="product-group-filter">
+			<option value="all">{{ $L('All') }}</option>
+			@foreach($productGroups as $productGroup)
+				<option value="{{ $productGroup->id }}">{{ $productGroup->name }}</option>
+			@endforeach
+		</select>
+	</div>
 </div>
 
 <div class="row">