diff --git a/app/assets/javascripts/bastion/layouts/details-nutupane.html b/app/assets/javascripts/bastion/layouts/details-nutupane.html
index b7f373816..209a73bd4 100644
--- a/app/assets/javascripts/bastion/layouts/details-nutupane.html
+++ b/app/assets/javascripts/bastion/layouts/details-nutupane.html
@@ -70,7 +70,11 @@ <h4>
         <a ng-click="detailsTable.selectAllResults(false)" translate>Deselect all</a>
       </div>
 
-      <div data-block="table"></div>
+      <p bst-alert="info" ng-show="detailsTable.rows.length === 0 && !detailsTable.working">
+        <span data-block="no-items-message"></span>
+      </p>
+
+      <div ng-show="detailsTable.rows.length > 0" data-block="table"></div>
     </div>
   </div>
 
diff --git a/app/assets/javascripts/bastion/layouts/nutupane.html b/app/assets/javascripts/bastion/layouts/nutupane.html
index 6f6018185..3f689b80c 100644
--- a/app/assets/javascripts/bastion/layouts/nutupane.html
+++ b/app/assets/javascripts/bastion/layouts/nutupane.html
@@ -57,7 +57,11 @@ <h2 class="col-sm-2">
       <span ng-hide="$root.$state.current.collapsed">{{ "Loading..." | translate }}</span>
     </div>
 
-    <div bst-container-scroll bst-infinite-scroll="table.nextPage()" data="table.rows">
+    <p bst-alert="info" ng-show="table.rows.length === 0 && !table.working">
+      <span data-block="no-items-message"></span>
+    </p>
+
+    <div ng-show="table.rows.length > 0" bst-container-scroll bst-infinite-scroll="table.nextPage()" data="table.rows">
       <div ui-view="table"></div>
     </div>
   </div>