diff --git a/docs-core/src/main/java/com/sismics/docs/core/listener/async/RebuildIndexAsyncListener.java b/docs-core/src/main/java/com/sismics/docs/core/listener/async/RebuildIndexAsyncListener.java
index 07f481a4..12241d43 100644
--- a/docs-core/src/main/java/com/sismics/docs/core/listener/async/RebuildIndexAsyncListener.java
+++ b/docs-core/src/main/java/com/sismics/docs/core/listener/async/RebuildIndexAsyncListener.java
@@ -63,5 +63,9 @@ public class RebuildIndexAsyncListener {
                 offset += 100;
             } while (fileList.size() > 0);
         });
+
+        if (log.isInfoEnabled()) {
+            log.info("Rebuilding index done");
+        }
     }
 }
diff --git a/docs-core/src/main/java/com/sismics/docs/core/model/context/AppContext.java b/docs-core/src/main/java/com/sismics/docs/core/model/context/AppContext.java
index 57ef11bc..9cc433a3 100644
--- a/docs-core/src/main/java/com/sismics/docs/core/model/context/AppContext.java
+++ b/docs-core/src/main/java/com/sismics/docs/core/model/context/AppContext.java
@@ -190,7 +190,7 @@ public class AppContext {
     public int getQueuedTaskCount() {
         int queueSize = 0;
         for (ThreadPoolExecutor executor : asyncExecutorList) {
-            queueSize += executor.getQueue().size();
+            queueSize += executor.getTaskCount() - executor.getCompletedTaskCount();
         }
         return queueSize;
     }
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsMonitoring.js b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsMonitoring.js
index da6257a5..1236cfdd 100644
--- a/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsMonitoring.js
+++ b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsMonitoring.js
@@ -13,4 +13,11 @@ angular.module('docs').controller('SettingsMonitoring', function($scope, Restang
   }).then(function(data) {
     $scope.logs = data.logs;
   });
+
+  $scope.reindexingStarted = false;
+  $scope.startReindexing = function() {
+    Restangular.one('app').post('batch/reindex').then(function () {
+      $scope.reindexingStarted = true;
+    });
+  };
 });
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/locale/en.json b/docs-web/src/main/webapp/src/locale/en.json
index 566b57f9..f8b9c473 100644
--- a/docs-web/src/main/webapp/src/locale/en.json
+++ b/docs-web/src/main/webapp/src/locale/en.json
@@ -411,7 +411,11 @@
       "server_logs": "Server logs",
       "log_date": "Date",
       "log_tag": "Tag",
-      "log_message": "Message"
+      "log_message": "Message",
+      "indexing": "Indexing",
+      "indexing_info": "If you notice discrepancies in the search results, you can try to do a full reindexing. Search results will be incomplete until this operation is done.",
+      "start_reindexing": "Start full reindexing",
+      "reindexing_started": "Re-indexing started, please wait until there is no more background tasks."
     },
     "session": {
       "title": "Opened sessions",
diff --git a/docs-web/src/main/webapp/src/partial/docs/settings.monitoring.html b/docs-web/src/main/webapp/src/partial/docs/settings.monitoring.html
index 81f4e7bf..baf96852 100644
--- a/docs-web/src/main/webapp/src/partial/docs/settings.monitoring.html
+++ b/docs-web/src/main/webapp/src/partial/docs/settings.monitoring.html
@@ -5,6 +5,14 @@
   <span class="fas fa-circle-notch text-warning fa-spin" ng-if="app.queued_tasks > 0"></span>
 </p>
 <p>{{ 'settings.monitoring.queued_tasks_explain' | translate }}</p>
+
+<h2 translate="settings.monitoring.indexing"></h2>
+{{ 'settings.monitoring.indexing_info' | translate }}
+<div class="mt-10">
+  <button class="btn btn-danger" ng-click="startReindexing()" ng-show="!reindexingStarted">{{ 'settings.monitoring.start_reindexing' | translate }}</button>
+  <span class="text-danger" ng-show="reindexingStarted"><strong>{{ 'settings.monitoring.reindexing_started' | translate }}</strong></span>
+</div>
+
 <h2 translate="settings.monitoring.server_logs"></h2>
 <table class="table table-hover table-logs">
   <thead>