diff --git a/client/galaxy/scripts/components/admin/DisplayApplications.vue b/client/galaxy/scripts/components/admin/DisplayApplications.vue
index fc5b835b4be..26738f215ce 100644
--- a/client/galaxy/scripts/components/admin/DisplayApplications.vue
+++ b/client/galaxy/scripts/components/admin/DisplayApplications.vue
@@ -3,6 +3,9 @@
         <div v-if="messageVisible" :class="messageClass">
             {{ messageText }}
         </div>
+        <div v-if="!applicationsVisible" class="alert alert-warning">
+            No display applications available.
+        </div>
         <div v-if="applicationsVisible" class="card-header">
             There are currently {{ applicationsLength }}
             <a class="icon-btn" @click.prevent="reloadAll()" title="Reload all display applications" data-placement="bottom">
@@ -28,7 +31,7 @@ import { getGalaxyInstance } from "app";
 import axios from "axios";
 
 const errorMessageClass = "alert alert-danger";
-const successMessageClass = "alert alert-info";
+const infoMessageClass = "alert alert-info";
 
 export default {
     data() {
@@ -99,7 +102,7 @@ export default {
             axios
                 .post(url, {ids: ids})
                 .then(response => {
-                    this.messageClass = successMessageClass;
+                    this.messageClass = infoMessageClass;
                     this.messageText = response.data.message;
                     this._highlightRows(response.data.failed, "danger");
                     this._highlightRows(response.data.reloaded, "success");
diff --git a/test/selenium_tests/test_admin_app.py b/test/selenium_tests/test_admin_app.py
index 3c736a7e4f8..a2db96290cc 100644
--- a/test/selenium_tests/test_admin_app.py
+++ b/test/selenium_tests/test_admin_app.py
@@ -23,7 +23,7 @@ class AdminAppTestCase(SeleniumTestCase):
         self.screenshot("admin_data_tables")
 
         admin_component.index.display_applications.wait_for_and_click()
-        admin_component.display_applications_grid.wait_for_visible()
+        self.assert_warning_message("No display applications available.")
         self.screenshot("admin_display_applications")
 
         admin_component.index.jobs.wait_for_and_click()