diff --git a/Netdisco/Changes b/Netdisco/Changes
index 98efa34a..a2b9971c 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -12,6 +12,7 @@
   * Change default number of pollers to 10
   * Default netmap depth set to 8
   * Add a "waiting" message to the netmap whilst the data loads
+  * Add a spinner to all waiting messages
 
   [BUG FIXES]
 
diff --git a/Netdisco/share/public/javascripts/netdisco.js b/Netdisco/share/public/javascripts/netdisco.js
index 8427d5dd..dcf55ebd 100644
--- a/Netdisco/share/public/javascripts/netdisco.js
+++ b/Netdisco/share/public/javascripts/netdisco.js
@@ -26,7 +26,7 @@ function do_search (event, tab) {
 
   // in case of slow data load, let the user know
   $(target).html(
-    '<div class="span2 alert">Waiting for results...</div>'
+    '<div class="span2 alert"><i class="icon-spinner icon-spin"></i> Waiting for results...</div>'
   );
 
   // submit the query and put results into the tab pane