diff --git a/ChangeLog b/ChangeLog
index 53ddffd2b..0b3264b1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-11-15  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/WebServerResources/generic.js: the progress indicator is on
+	when loading the page so we turn it off, and we turn it back on
+	whenever we switch to another module...
+
 	* UI/WebServerResources/SchedulerUI.js: make sure the day view
 	synchronization mechanism works everywhere.
 
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index 16ac02335..84baa359b 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -59,7 +59,7 @@
             ><var:if condition="context.isUIxDebugEnabled"
               ><div id="logConsole"><!-- space --></div></var:if>
 
-            <div class="linkbanner">
+            <div id="linkBanner" class="linkbanner">
               <a var:href="relativeHomePath"
                 ><var:string label:value="Home" /></a> |
               <a var:href="relativeCalendarPath"
diff --git a/UI/Templates/UIxToolbar.wox b/UI/Templates/UIxToolbar.wox
index d30c113bd..9b9f7836f 100644
--- a/UI/Templates/UIxToolbar.wox
+++ b/UI/Templates/UIxToolbar.wox
@@ -47,5 +47,6 @@
            /></span
         ></var:if>
       </var:foreach>
+      <img id="progressIndicator" rsrc:src="busy.gif" />
     </div>
   </var:if>
diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css
index 5a3176abb..5b8e9a35d 100644
--- a/UI/WebServerResources/generic.css
+++ b/UI/WebServerResources/generic.css
@@ -28,6 +28,11 @@ TABLE, DIV, IMG
   margin: 0px;
   padding: 0px; }
 
+IMG#progressIndicator
+{ position: absolute;
+  top: 2.5em;
+  right: 1em; }
+
 DIV.pageContent
 { /* position: absolute;
   background: #ffa;
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 13c58d074..372e1d669 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -224,12 +224,9 @@ function checkAjaxRequestsState() {
         && !document.busyAnim) {
       var anim = document.createElement("img");
       document.busyAnim = anim;
+      anim.id = "progressIndicator";
       anim.src = ResourcesURL + "/busy.gif";
-      anim.style.position = "absolute;";
-      anim.style.top = "2.5em;";
-      anim.style.right = "1em;";
       anim.style.visibility = "hidden;";
-      anim.style.zindex = "1;";
       toolbar.appendChild(anim);
       anim.style.visibility = "visible;";
     }
@@ -941,6 +938,10 @@ var onLoadHandler = {
     initTabs();
     configureDragHandles();
     configureSortableTableHeaders();
+    configureLinkBanner();
+    var progressImage = $("progressIndicator");
+    if (progressImage)
+      progressImage.parentNode.removeChild(progressImage);
   }
 }
 
@@ -956,6 +957,22 @@ function configureSortableTableHeaders() {
   }
 }
 
+function onLinkBannerClick() {
+  activeAjaxRequests++;
+  checkAjaxRequestsState();
+}
+
+function configureLinkBanner() {
+  var linkBanner = $("linkBanner");
+  if (linkBanner) {
+    var anchors = linkBanner.childNodesWithTag("a");
+    for (var i = 0; i < anchors.length; i++) {
+      anchors[i].addEventListener("mousedown", listRowMouseDownHandler, false);
+      anchors[i].addEventListener("click", onLinkBannerClick, false);
+    }
+  }
+}
+
 window.addEventListener("load", onLoadHandler, false);
 
 /* stubs */