diff --git a/public/js/grocy.js b/public/js/grocy.js
index dbf0ec25..2cc6f772 100644
--- a/public/js/grocy.js
+++ b/public/js/grocy.js
@@ -989,7 +989,8 @@ $(".change-table-columns-visibility-button").on("click", function(e)
 	dataTable.columns().every(function()
 	{
 		var index = this.index();
-		var title = $(this.header()).text();
+		var headerCell = $(this.header());
+		var title = headerCell.text();
 		var visible = this.visible();
 
 		if (title.isEmpty() || title.startsWith("Hidden"))
@@ -997,7 +998,7 @@ $(".change-table-columns-visibility-button").on("click", function(e)
 			return;
 		}
 
-		var shadowColumnIndex = $(this.header()).attr("data-shadow-rowgroup-column");
+		var shadowColumnIndex = headerCell.attr("data-shadow-rowgroup-column");
 		if (shadowColumnIndex)
 		{
 			index = shadowColumnIndex;
@@ -1022,7 +1023,7 @@ $(".change-table-columns-visibility-button").on("click", function(e)
 				</label> \
 			</div>';
 
-		if (rowGroupDefined)
+		if (rowGroupDefined && headerCell.hasClass("allow-grouping"))
 		{
 			var rowGroupChecked = "";
 			if (dataTable.rowGroup().enabled() && dataTable.rowGroup().dataSrc() == index)
@@ -1046,10 +1047,25 @@ $(".change-table-columns-visibility-button").on("click", function(e)
 		}
 	});
 
-	var message = '<div class="text-center"><h5>' + __t('Table options') + '</h5><hr><h5 class="mb-0">' + __t('Hide/view columns') + '</h5><div class="text-left form-group">' + columnCheckBoxesHtml + '</div></div>';
+	var message = '\
+		<div class="text-center"> \
+			<h5>' + __t('Table options') + '</h5> \
+			<hr> \
+			<h5 class="mb-0">' + __t('Hide/view columns') + '</h5> \
+			<div class="text-left form-group"> \
+				' + columnCheckBoxesHtml + ' \
+			</div> \
+		</div>';
+
 	if (rowGroupDefined)
 	{
-		message += '<div class="text-center mt-1"><h5 class="pt-3 mb-0">' + __t('Group by') + '</h5><div class="text-left form-group">' + rowGroupRadioBoxesHtml + '</div></div>';
+		message += ' \
+			<div class="text-center mt-1"> \
+				<h5 class="pt-3 mb-0">' + __t('Group by') + '</h5> \
+				<div class="text-left form-group"> \
+					' + rowGroupRadioBoxesHtml + ' \
+				</div> \
+			</div>';
 	}
 
 	bootbox.dialog({
diff --git a/views/batteries.blade.php b/views/batteries.blade.php
index 89b15260..f4a590f8 100644
--- a/views/batteries.blade.php
+++ b/views/batteries.blade.php
@@ -89,8 +89,8 @@
 					</th>
 					<th>{{ $__t('Name') }}</th>
 					<th>{{ $__t('Description') }}</th>
-					<th>{{ $__t('Used in') }}</th>
-					<th>{{ $__t('Charge cycle interval (days)') }}</th>
+					<th class="allow-grouping">{{ $__t('Used in') }}</th>
+					<th class="allow-grouping">{{ $__t('Charge cycle interval (days)') }}</th>
 
 					@include('components.userfields_thead', array(
 					'userfields' => $userfields
diff --git a/views/batteriesjournal.blade.php b/views/batteriesjournal.blade.php
index 89f482d1..2efa8c9c 100644
--- a/views/batteriesjournal.blade.php
+++ b/views/batteriesjournal.blade.php
@@ -88,7 +88,7 @@
 							data-table-selector="#batteries-journal-table"
 							href="#"><i class="fas fa-eye"></i></a>
 					</th>
-					<th>{{ $__t('Battery') }}</th>
+					<th class="allow-grouping">{{ $__t('Battery') }}</th>
 					<th>{{ $__t('Tracked time') }}</th>
 				</tr>
 			</thead>
diff --git a/views/batteriesoverview.blade.php b/views/batteriesoverview.blade.php
index 932d7044..23ebee6d 100644
--- a/views/batteriesoverview.blade.php
+++ b/views/batteriesoverview.blade.php
@@ -101,7 +101,7 @@
 							href="#"><i class="fas fa-eye"></i></a>
 					</th>
 					<th>{{ $__t('Battery') }}</th>
-					<th>{{ $__t('Used in') }}</th>
+					<th class="allow-grouping">{{ $__t('Used in') }}</th>
 					<th>{{ $__t('Last charged') }}</th>
 					<th>{{ $__t('Next planned charge cycle') }}</th>
 					<th class="d-none">Hidden status</th>
diff --git a/views/chores.blade.php b/views/chores.blade.php
index 6b23055c..b0ace94b 100644
--- a/views/chores.blade.php
+++ b/views/chores.blade.php
@@ -89,7 +89,7 @@
 							href="#"><i class="fas fa-eye"></i></a>
 					</th>
 					<th>{{ $__t('Name') }}</th>
-					<th>{{ $__t('Period type') }}</th>
+					<th class="allow-grouping">{{ $__t('Period type') }}</th>
 					<th>{{ $__t('Description') }}</th>
 
 					@include('components.userfields_thead', array(
diff --git a/views/choresjournal.blade.php b/views/choresjournal.blade.php
index 04bb1a29..17bc3da7 100644
--- a/views/choresjournal.blade.php
+++ b/views/choresjournal.blade.php
@@ -88,10 +88,10 @@
 							data-table-selector="#chores-journal-table"
 							href="#"><i class="fas fa-eye"></i></a>
 					</th>
-					<th>{{ $__t('Chore') }}</th>
+					<th class="allow-grouping">{{ $__t('Chore') }}</th>
 					<th>{{ $__t('Tracked time') }}</th>
 					@if(GROCY_FEATURE_FLAG_CHORES_ASSIGNMENTS)
-					<th>{{ $__t('Done by') }}</th>
+					<th class="allow-grouping">{{ $__t('Done by') }}</th>
 					@endif
 
 					@include('components.userfields_thead', array(
diff --git a/views/choresoverview.blade.php b/views/choresoverview.blade.php
index 123bb847..45b45ae3 100644
--- a/views/choresoverview.blade.php
+++ b/views/choresoverview.blade.php
@@ -125,7 +125,7 @@
 					<th>{{ $__t('Chore') }}</th>
 					<th>{{ $__t('Next estimated tracking') }}</th>
 					<th>{{ $__t('Last tracked') }}</th>
-					<th class="@if(!GROCY_FEATURE_FLAG_CHORES_ASSIGNMENTS) d-none @endif">{{ $__t('Assigned to') }}</th>
+					<th class="@if(!GROCY_FEATURE_FLAG_CHORES_ASSIGNMENTS) d-none @endif allow-grouping">{{ $__t('Assigned to') }}</th>
 					<th class="d-none">Hidden status</th>
 					<th class="d-none">Hidden assigned to user id</th>
 
diff --git a/views/components/userfields_thead.blade.php b/views/components/userfields_thead.blade.php
index b7410f52..a79df38d 100644
--- a/views/components/userfields_thead.blade.php
+++ b/views/components/userfields_thead.blade.php
@@ -3,7 +3,7 @@
 @foreach($userfields as $userfield)
 
 @if($userfield->show_as_column_in_tables == 1)
-<th>{{ $userfield->caption }}</th>
+<th class="allow-grouping">{{ $userfield->caption }}</th>
 @endif
 
 @endforeach
diff --git a/views/manageapikeys.blade.php b/views/manageapikeys.blade.php
index 6c5f2e80..5cc45604 100644
--- a/views/manageapikeys.blade.php
+++ b/views/manageapikeys.blade.php
@@ -83,11 +83,11 @@
 							href="#"><i class="fas fa-eye"></i></a>
 					</th>
 					<th>{{ $__t('API key') }}</th>
-					<th>{{ $__t('User') }}</th>
+					<th class="allow-grouping">{{ $__t('User') }}</th>
 					<th>{{ $__t('Expires') }}</th>
 					<th>{{ $__t('Last used') }}</th>
 					<th>{{ $__t('Created') }}</th>
-					<th>{{ $__t('Key type') }}</th>
+					<th class="allow-grouping">{{ $__t('Key type') }}</th>
 				</tr>
 			</thead>
 			<tbody class="d-none">
diff --git a/views/productform.blade.php b/views/productform.blade.php
index 899df671..a86662b8 100644
--- a/views/productform.blade.php
+++ b/views/productform.blade.php
@@ -557,8 +557,8 @@
 									href="#"><i class="fas fa-eye"></i></a>
 							</th>
 							<th>{{ $__t('Barcode') }}</th>
-							<th class="@if(!GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) d-none @endif">{{ $__t('Store') }}</th>
-							<th>{{ $__t('Quantity unit') }}</th>
+							<th class="@if(!GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) d-none @endif allow-grouping">{{ $__t('Store') }}</th>
+							<th class="allow-grouping">{{ $__t('Quantity unit') }}</th>
 							<th>{{ $__t('Amount') }}</th>
 							<th class="@if(!GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) d-none @endif">{{ $__t('Last price') }}</th>
 							<th>{{ $__t('Note') }}</th>
@@ -693,10 +693,10 @@
 									data-table-selector="#qu-conversions-table-products"
 									href="#"><i class="fas fa-eye"></i></a>
 							</th>
-							<th>{{ $__t('Quantity unit from') }}</th>
-							<th>{{ $__t('Quantity unit to') }}</th>
+							<th class="allow-grouping">{{ $__t('Quantity unit from') }}</th>
+							<th class="allow-grouping">{{ $__t('Quantity unit to') }}</th>
 							<th>{{ $__t('Factor') }}</th>
-							<th>{{ $__t('Group')}}</th>
+							<th class="allow-grouping">{{ $__t('Group')}}</th>
 							<th></th>
 						</tr>
 					</thead>
diff --git a/views/products.blade.php b/views/products.blade.php
index b23132a7..ffa278ee 100644
--- a/views/products.blade.php
+++ b/views/products.blade.php
@@ -118,12 +118,12 @@
 							href="#"><i class="fas fa-eye"></i></a>
 					</th>
 					<th>{{ $__t('Name') }}</th>
-					<th class="@if(!GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING) d-none @endif">{{ $__t('Location') }}</th>
-					<th>{{ $__t('Min. stock amount') }}</th>
-					<th>{{ $__t('Default quantity unit purchase') }}</th>
-					<th>{{ $__t('Quantity unit stock') }}</th>
-					<th>{{ $__t('Product group') }}</th>
-					<th class="@if(!GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) d-none @endif">{{ $__t('Default store') }}</th>
+					<th class="@if(!GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING) d-none @endif allow-grouping">{{ $__t('Location') }}</th>
+					<th class="allow-grouping">{{ $__t('Min. stock amount') }}</th>
+					<th class="">{{ $__t('Default quantity unit purchase') }}</th>
+					<th class="allow-grouping">{{ $__t('Quantity unit stock') }}</th>
+					<th class="">{{ $__t('Product group') }}</th>
+					<th class="@if(!GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) d-none @endif allow-grouping">{{ $__t('Default store') }}</th>
 
 					@include('components.userfields_thead', array(
 					'userfields' => $userfields
@@ -246,7 +246,18 @@
 					<label for="merge-products-remove">{{ $__t('Product to remove') }}&nbsp;<i class="fas fa-question-circle text-muted"
 							data-toggle="tooltip"
 							data-trigger="hover click"
-							title="{{ $__t('After merging, all occurences of this product will be replaced by "Product to keep" (means this product will not exist anymore)') }}"></i>
+							title="{{ $__t('After merging, all occurences of this product will be replaced by "
+							Product
+							to
+							keep"
+							(means
+							this
+							product
+							will
+							not
+							exist
+							anymore)')
+							}}"></i>
 					</label>
 					<select class="custom-control custom-select"
 						id="merge-products-remove">
diff --git a/views/recipeform.blade.php b/views/recipeform.blade.php
index 52ffaf83..e20968e4 100644
--- a/views/recipeform.blade.php
+++ b/views/recipeform.blade.php
@@ -147,7 +147,7 @@
 							<th>{{ $__t('Product') }}</th>
 							<th>{{ $__t('Amount') }}</th>
 							<th class="fit-content">{{ $__t('Note') }}</th>
-							<th>{{ $__t('Ingredient group') }}</th>
+							<th class="allow-grouping">{{ $__t('Ingredient group') }}</th>
 						</tr>
 					</thead>
 					<tbody class="d-none">
diff --git a/views/recipes.blade.php b/views/recipes.blade.php
index 00d1b0af..9475b9b6 100644
--- a/views/recipes.blade.php
+++ b/views/recipes.blade.php
@@ -117,9 +117,9 @@
 									href="#"><i class="fas fa-eye"></i></a>
 							</th>
 							<th>{{ $__t('Name') }}</th>
-							<th>{{ $__t('Desired servings') }}</th>
+							<th class="allow-grouping">{{ $__t('Desired servings') }}</th>
 							<th data-shadow-rowgroup-column="7"
-								class="@if(!GROCY_FEATURE_FLAG_STOCK) d-none @endif">{{ $__t('Requirements fulfilled') }}</th>
+								class="@if(!GROCY_FEATURE_FLAG_STOCK) d-none @endif allow-grouping">{{ $__t('Requirements fulfilled') }}</th>
 							<th class="d-none">Hidden status for sorting of "Requirements fulfilled" column</th>
 							<th class="d-none">Hidden status for filtering by status</th>
 							<th class="d-none">Hidden recipe ingredient product names</th>
diff --git a/views/shoppinglist.blade.php b/views/shoppinglist.blade.php
index 12206738..8b896d5e 100644
--- a/views/shoppinglist.blade.php
+++ b/views/shoppinglist.blade.php
@@ -170,13 +170,13 @@
 							data-table-selector="#shoppinglist-table"
 							href="#"><i class="fas fa-eye"></i></a>
 					</th>
-					<th>{{ $__t('Product') }} / <em>{{ $__t('Note') }}</em></th>
+					<th class="allow-grouping">{{ $__t('Product') }} / <em>{{ $__t('Note') }}</em></th>
 					<th>{{ $__t('Amount') }}</th>
-					<th>{{ $__t('Product group') }}</th>
+					<th class="allow-grouping">{{ $__t('Product group') }}</th>
 					<th class="d-none">Hidden status</th>
 					<th class="@if(!GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) d-none @endif">{{ $__t('Last price (Unit)') }}</th>
 					<th class="@if(!GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) d-none @endif">{{ $__t('Last price (Total)') }}</th>
-					<th class="@if(!GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) d-none @endif">{{ $__t('Default store') }}</th>
+					<th class="@if(!GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) d-none @endif allow-grouping">{{ $__t('Default store') }}</th>
 					<th>{{ $__t('Barcodes') }}</th>
 
 					@include('components.userfields_thead', array(
diff --git a/views/stockentries.blade.php b/views/stockentries.blade.php
index 765ee903..095aca29 100644
--- a/views/stockentries.blade.php
+++ b/views/stockentries.blade.php
@@ -63,13 +63,14 @@
 							href="#"><i class="fas fa-eye"></i></a>
 					</th>
 					<th class="d-none">Hidden product_id</th> <!-- This must be in the first column for searching -->
-					<th>{{ $__t('Product') }}</th>
+					<th class="allow-grouping">{{ $__t('Product') }}</th>
 					<th>{{ $__t('Amount') }}</th>
-					<th class="@if(!GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING) d-none @endif">{{ $__t('Due date') }}</th>
-					<th class="@if(!GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING) d-none @endif">{{ $__t('Location') }}</th>
-					<th class="@if(!GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) d-none @endif">{{ $__t('Store') }}</th>
+					<th class="@if(!GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING) d-none @endif allow-grouping">{{ $__t('Due date') }}</th>
+					<th class="@if(!GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING) d-none @endif allow-grouping">{{ $__t('Location') }}</th>
+					<th class="@if(!GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) d-none @endif allow-grouping">{{ $__t('Store') }}</th>
 					<th class="@if(!GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) d-none @endif">{{ $__t('Price') }}</th>
-					<th data-shadow-rowgroup-column="9">{{ $__t('Purchased date') }}</th>
+					<th class="allow-grouping"
+						data-shadow-rowgroup-column="9">{{ $__t('Purchased date') }}</th>
 					<th class="d-none">Hidden purchased_date</th>
 					<th>{{ $__t('Timestamp') }}</th>
 
diff --git a/views/stockjournal.blade.php b/views/stockjournal.blade.php
index 4191674e..c65c0df1 100644
--- a/views/stockjournal.blade.php
+++ b/views/stockjournal.blade.php
@@ -141,12 +141,12 @@
 							data-table-selector="#stock-journal-table"
 							href="#"><i class="fas fa-eye"></i></a>
 					</th>
-					<th>{{ $__t('Product') }}</th>
+					<th class="allow-grouping">{{ $__t('Product') }}</th>
 					<th>{{ $__t('Amount') }}</th>
 					<th>{{ $__t('Transaction time') }}</th>
-					<th>{{ $__t('Transaction type') }}</th>
-					<th class="@if(!GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING) d-none @endif">{{ $__t('Location') }}</th>
-					<th>{{ $__t('Done by') }}</th>
+					<th class="allow-grouping">{{ $__t('Transaction type') }}</th>
+					<th class="@if(!GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING) d-none @endif allow-grouping">{{ $__t('Location') }}</th>
+					<th class="allow-grouping">{{ $__t('Done by') }}</th>
 				</tr>
 			</thead>
 			<tbody class="d-none">
diff --git a/views/stockjournalsummary.blade.php b/views/stockjournalsummary.blade.php
index 4cf4c44c..51ca7661 100644
--- a/views/stockjournalsummary.blade.php
+++ b/views/stockjournalsummary.blade.php
@@ -100,9 +100,9 @@
 							data-table-selector="#stock-journal-summary-table"
 							href="#"><i class="fas fa-eye"></i></a>
 					</th>
-					<th>{{ $__t('Product') }}</th>
-					<th>{{ $__t('Transaction type') }}</th>
-					<th>{{ $__t('User') }}</th>
+					<th class="allow-grouping">{{ $__t('Product') }}</th>
+					<th class="allow-grouping">{{ $__t('Transaction type') }}</th>
+					<th class="allow-grouping">{{ $__t('User') }}</th>
 					<th>{{ $__t('Amount') }}</th>
 				</tr>
 			</thead>
diff --git a/views/stockoverview.blade.php b/views/stockoverview.blade.php
index 8c088c44..ccda18bb 100755
--- a/views/stockoverview.blade.php
+++ b/views/stockoverview.blade.php
@@ -158,21 +158,21 @@
 							href="#"><i class="fas fa-eye"></i></a>
 					</th>
 					<th>{{ $__t('Product') }}</th>
-					<th>{{ $__t('Product group') }}</th>
+					<th class="allow-grouping">{{ $__t('Product group') }}</th>
 					<th>{{ $__t('Amount') }}</th>
 					<th class="@if(!GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) d-none @endif">{{ $__t('Value') }}</th>
-					<th class="@if(!GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING) d-none @endif">{{ $__t('Next due date') }}</th>
+					<th class="@if(!GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING) d-none @endif allow-grouping">{{ $__t('Next due date') }}</th>
 					<th class="d-none">Hidden location</th>
 					<th class="d-none">Hidden status</th>
 					<th class="d-none">Hidden product group</th>
 					<th>{{ $__t('Calories') }} ({{ $__t('Per stock quantity unit') }})</th>
 					<th>{{ $__t('Calories') }}</th>
-					<th>{{ $__t('Last purchased') }}</th>
+					<th class="allow-grouping">{{ $__t('Last purchased') }}</th>
 					<th class="@if(!GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) d-none @endif">{{ $__t('Last price') }}</th>
-					<th>{{ $__t('Min. stock amount') }}</th>
+					<th class="allow-grouping">{{ $__t('Min. stock amount') }}</th>
 					<th>{{ $__t('Product description') }}</th>
-					<th>{{ $__t('Parent product') }}</th>
-					<th>{{ $__t('Default location') }}</th>
+					<th class="allow-grouping">{{ $__t('Parent product') }}</th>
+					<th class="allow-grouping">{{ $__t('Default location') }}</th>
 					<th>{{ $__t('Product picture') }}</th>
 					<th>{{ $__t('Average price') }}</th>
 
diff --git a/views/tasks.blade.php b/views/tasks.blade.php
index 0bcba971..06847d73 100644
--- a/views/tasks.blade.php
+++ b/views/tasks.blade.php
@@ -112,9 +112,10 @@
 							href="#"><i class="fas fa-eye"></i></a>
 					</th>
 					<th>{{ $__t('Task') }}</th>
-					<th>{{ $__t('Due') }}</th>
-					<th data-shadow-rowgroup-column="6">{{ $__t('Category') }}</th>
-					<th>{{ $__t('Assigned to') }}</th>
+					<th class="allow-grouping">{{ $__t('Due') }}</th>
+					<th class="allow-grouping"
+						data-shadow-rowgroup-column="6">{{ $__t('Category') }}</th>
+					<th class="allow-grouping">{{ $__t('Assigned to') }}</th>
 					<th class="d-none">Hidden status</th>
 					<th class="d-none">Hidden category_id</th>
 
diff --git a/views/userfields.blade.php b/views/userfields.blade.php
index 1002b813..652439de 100644
--- a/views/userfields.blade.php
+++ b/views/userfields.blade.php
@@ -88,10 +88,10 @@
 							data-table-selector="#userfields-table"
 							href="#"><i class="fas fa-eye"></i></a>
 					</th>
-					<th>{{ $__t('Entity') }}</th>
+					<th class="allow-grouping">{{ $__t('Entity') }}</th>
 					<th>{{ $__t('Name') }}</th>
 					<th>{{ $__t('Caption') }}</th>
-					<th>{{ $__t('Type') }}</th>
+					<th class="allow-grouping">{{ $__t('Type') }}</th>
 					<th>{{ $__t('Sort number') }}</th>
 				</tr>
 			</thead>