diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js
index 1c74056c75b..c5e0561606f 100644
--- a/ui/scripts/ui/widgets/listView.js
+++ b/ui/scripts/ui/widgets/listView.js
@@ -863,16 +863,14 @@
     var uiCustom = listViewArgs.uiCustom;
     var subselect = uiCustom ? listViewArgs.listView.subselect : null;
 
-    if (!data || !data.length) {
+    if (!(data && data.length)) {
       if (!$tbody.find('tr').size()) {
         return [
-          $('<tr>').addClass('empty').append(
+          $('<tr>').addClass('empty last').append(
             $('<td>').html(_l('label.no.data'))
           ).appendTo($tbody)
         ];
       }
-
-      return $tbody.find('tr:last').addClass('last');
     }
 
     $tbody.find('tr.empty').remove();