diff --git a/src/Column/ColumnStatus.php b/src/Column/ColumnStatus.php
index 668399e4..65c4c473 100644
--- a/src/Column/ColumnStatus.php
+++ b/src/Column/ColumnStatus.php
@@ -10,6 +10,7 @@
use Ublaboo\DataGrid\Row;
use Ublaboo\DataGrid\Status\Option;
use Ublaboo\DataGrid\Traits\TButtonCaret;
+use Ublaboo\DataGrid\Traits\TRenderCondition;
/**
* @method onChange(string $id, string $value)
@@ -19,6 +20,7 @@ class ColumnStatus extends Column
use TButtonCaret;
use SmartObject;
+ use TRenderCondition;
/**
* @var array|callable[]
diff --git a/src/templates/column_status.latte b/src/templates/column_status.latte
index 8e7ca029..a5e47fc1 100644
--- a/src/templates/column_status.latte
+++ b/src/templates/column_status.latte
@@ -7,10 +7,14 @@
{if $activeOption}
-
+ {if $status->shouldBeRendered($row)}
+
+ {else}
+ {$active_option->getText()|translate}
+ {/if}
{else}
{$row->getValue($status->getColumn())}
{/if}
diff --git a/src/templates/datagrid.latte b/src/templates/datagrid.latte
index cccea428..766d21f9 100644
--- a/src/templates/datagrid.latte
+++ b/src/templates/datagrid.latte
@@ -38,8 +38,8 @@
{var $i = 0}
- {var $filter_columns_class = 'col-sm-' . (12 / $control->getOuterFilterColumnsCount())}
-
+ {var $filterColumnsClass = 'col-sm-' . (12 / $control->getOuterFilterColumnsCount())}
+
{**
* Each fitler is rendered separately in its own template
*}