diff --git a/applications/default/extensions/display/public/templates/list-group.html b/applications/default/extensions/display/public/templates/list-group.html
index 453bb50..8d8b5a3 100644
--- a/applications/default/extensions/display/public/templates/list-group.html
+++ b/applications/default/extensions/display/public/templates/list-group.html
@@ -1,3 +1,4 @@
 <div class="list-group">
   <div ng-repeat="item in items" ng-controller="ItemController" ng-include="view.itemTemplate || '/templates/list-group-item.html'" class="list-group-item"></div>
+  <div ng-if="items.$empty" ng-include="view.emptyTemplate || 'templates/empty.html'" class="list-group-item no-items"></div>
 </div>
diff --git a/applications/default/public/js/controllers.js b/applications/default/public/js/controllers.js
index b8c49ed..89a8f99 100644
--- a/applications/default/public/js/controllers.js
+++ b/applications/default/public/js/controllers.js
@@ -185,6 +185,9 @@ angular.module('choko')
         if ($scope.view.template) {
           Choko.get(query, function(response) {
             $scope.items = response;
+            $scope.items.$empty = Object.keys($scope.items).filter(function(key) {
+              return key.indexOf('$') !== 0;
+            }).length ? false : true;
           });
         }
 
diff --git a/applications/default/public/templates/empty.html b/applications/default/public/templates/empty.html
new file mode 100644
index 0000000..00dd7bb
--- /dev/null
+++ b/applications/default/public/templates/empty.html
@@ -0,0 +1 @@
+<p>No items found.</p>
diff --git a/applications/default/public/templates/simple.html b/applications/default/public/templates/simple.html
index 8f87364..5c68e89 100644
--- a/applications/default/public/templates/simple.html
+++ b/applications/default/public/templates/simple.html
@@ -1 +1,2 @@
 <div ng-repeat="item in items" ng-controller="ItemController" ng-include="view.itemTemplate || 'item.html'" href="#" class="item"></div>
+<div ng-if="items.$empty" ng-include="view.emptyTemplate || 'templates/empty.html'" class="empty"></div>