diff --git a/admin-dev/themes/template/helper/list/list_content.tpl b/admin-dev/themes/template/helper/list/list_content.tpl
index 68c32d307..0a03de5bc 100644
--- a/admin-dev/themes/template/helper/list/list_content.tpl
+++ b/admin-dev/themes/template/helper/list/list_content.tpl
@@ -30,11 +30,11 @@
 	{if $index is odd}class="alt_row"{/if}
 	{if isset($tr.color) && $color_on_bg}style="background-color: {$tr.color}"{/if}
 	>
-		{if isset($tr.has_bulk_actions) && $tr.has_bulk_actions}
-			<td class="center">
+		<td class="center">
+			{if {$has_bulk_actions}}
 				<input type="checkbox" name="{$table}Box[]" value="{$tr.$identifier}" class="noborder" />
-			</td>
-		{/if}
+			{/if}
+		</td>
 		{foreach $fields_display AS $key => $params}
 			<td
 				{if isset($params.position)}
diff --git a/admin-dev/themes/template/helper/list/list_header.tpl b/admin-dev/themes/template/helper/list/list_header.tpl
index a2ebacc07..9d7549a94 100644
--- a/admin-dev/themes/template/helper/list/list_header.tpl
+++ b/admin-dev/themes/template/helper/list/list_header.tpl
@@ -150,7 +150,7 @@
  						{if !$simple_header}
 						<tr class="nodrag nodrop filter" style="height: 35px;">
 							<td class="center">
-								{if $delete}
+								{if $has_bulk_actions}
 									--
 								{/if}
 							</td>
diff --git a/classes/HelperList.php b/classes/HelperList.php
index c42d9e35a..a47a76dfd 100644
--- a/classes/HelperList.php
+++ b/classes/HelperList.php
@@ -215,11 +215,11 @@ class HelperListCore extends Helper
 					else if (method_exists($this, $method_name))
 						$this->_list[$index][$action] = $this->$method_name($token, $id);
 
-					// At least one bulk action is possible for this row
-					$this->_list[$index]['has_bulk_actions'] = true;
 				}
 			}
 
+			// @todo skip action for bulk actions
+			// $this->_list[$index]['has_bulk_actions'] = true;
 
 			foreach ($this->fieldsDisplay as $key => $params)
 			{