diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerImpl.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerImpl.java
index 15883603e..b01595606 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerImpl.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerImpl.java
@@ -657,14 +657,13 @@ public class SearchIndexerImpl implements SearchIndexer {
 
 		public void waitUntilIdle() {
 			for (int i = 0; i < 60; i++) {
-				if (pool.getActiveCount() == 0) {
+				try {
+					Thread.sleep(1000);
+				} catch (InterruptedException e) {
+					Thread.currentThread().interrupt();
+				}
+				if (pool.getActiveCount() + pool.getQueue().size() == 0) {
 					return;
-				} else {
-					try {
-						Thread.sleep(1000);
-					} catch (InterruptedException e) {
-						Thread.currentThread().interrupt();
-					}
 				}
 			}
 		}