diff --git a/PanoramicData.Blazor/PDTable.razor b/PanoramicData.Blazor/PDTable.razor
index b10929bcd..6b5f3cc80 100644
--- a/PanoramicData.Blazor/PDTable.razor
+++ b/PanoramicData.Blazor/PDTable.razor
@@ -10,7 +10,7 @@
 	 @oncontextmenu:preventDefault
 	 @ondrop="OnDragDropAsync"
 	 @onkeydown="OnKeyDownAsync"
-     @onkeydown:stopPropagation>
+	 @onkeydown:stopPropagation>
 	<table class="table @TableClass"
 		   @onmousedown="OnTableMouseDown">
 		<thead>
@@ -59,7 +59,7 @@
 								<PDFilter FetchValuesAsync="@((f) => OnFetchFilterValuesAsync(column, f))"
 										  Filter="column.Filter"
 										  FilterChanged="OnFilterChanged"
-                                          Options="@column.FilterOptions"
+										  Options="@column.FilterOptions"
 										  ShowValues="@column.FilterShowSuggestedValues"
 										  DataType="@column.GetFilterDataType()"
 										  Nullable="@column.GetFilterIsNullable()" />
@@ -133,13 +133,30 @@
 									{
 										<PDClipboard CssClass="me-1" Text="@(column.GetRenderValue(item))" />
 									}
-									if (column.Template == null)
+
+									if (AllowRightClick)
 									{
-										@column.GetRenderValue(item)
+										<div @oncontextmenu:stopPropagation>
+											@if (column.Template == null)
+											{
+												@column.GetRenderValue(item)
+											}
+											else
+											{
+												@column.Template(item)
+											}
+										</div>
 									}
 									else
 									{
-										@column.Template(item)
+										if (column.Template == null)
+										{
+											@column.GetRenderValue(item)
+										}
+										else
+										{
+											@column.Template(item)
+										}
 									}
 								}
 							</td>
diff --git a/PanoramicData.Blazor/PDTable.razor.cs b/PanoramicData.Blazor/PDTable.razor.cs
index 598e94e78..ef976774d 100644
--- a/PanoramicData.Blazor/PDTable.razor.cs
+++ b/PanoramicData.Blazor/PDTable.razor.cs
@@ -73,6 +73,11 @@ public partial class PDTable<TItem> :
 	/// </summary>
 	[Parameter] public bool AutoLoad { get; set; } = true;
 
+	/// <summary>
+	/// Determines whether items can be right-clicked to show a context menu or perform an action.
+	/// </summary>
+	[Parameter] public bool AllowRightClick { get; set; }
+
 	/// <summary>
 	/// Callback fired before an item edit begins.
 	/// </summary>