diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index 0dbd3c14cec..87c68f7304c 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -106,11 +106,12 @@ openerp.base.ContainerDataGroup = openerp.base.DataGroup.extend(
             __domain: group.__domain,
 
             grouped_on: field_name,
-            // if terminal group and group_by_no_leaf => use group.__count
+            // if terminal group (or no group) and group_by_no_leaf => use group.__count
             length: group[field_name + '_count'] || group.__count,
             value: group[field_name],
 
-            has_leaves: _.isUndefined(group.__count),
+            openable: !(this.context['group_by_no_leaf']
+                       && group.__context.group_by.length === 0),
 
             aggregates: aggregates
         };
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 2dd7daec45b..6b92f338c88 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -552,7 +552,7 @@ openerp.base.ListView.Groups = Class.extend( /** @lends openerp.base.ListView.Gr
         var placeholder = this.make_fragment();
         _(datagroups).each(function (group) {
             var $row = $('<tr>');
-            if (group.has_leaves) {
+            if (group.openable) {
                 $row.click(function (e) {
                     if (!$row.data('open')) {
                         $row.data('open', true);
@@ -576,14 +576,13 @@ openerp.base.ListView.Groups = Class.extend( /** @lends openerp.base.ListView.Gr
                         var $group_column = $('<th>')
                                 .text((group.value instanceof Array ? group.value[1] : group.value))
                                 .appendTo($row);
-                        if (group.has_leaves) {
+                        if (group.openable) {
                             $group_column
                                 .prepend('<span class="ui-icon ui-icon-triangle-1-e">');
                         }
                         self.indent($group_column, group.level);
                     } else if (column.id === '_count') {
-                        $('<td>').text(group.has_leaves ? group.length : '')
-                                 .appendTo($row);
+                        $('<td>').text(group.length).appendTo($row);
                     } else if (column.id in group.aggregates) {
                         var value = group.aggregates[column.id];
                         var format;