diff --git a/src/file/fileindexscheduler.h b/src/file/fileindexscheduler.h
--- a/src/file/fileindexscheduler.h
+++ b/src/file/fileindexscheduler.h
@@ -104,6 +104,7 @@
     void setSuspend(bool suspend);
     bool isIndexerIdle() {
         return m_isGoingIdle ||
+               (m_indexerState == Suspended) ||
                (m_indexerState == Idle) ||
                (m_indexerState == LowPowerIdle);
     }
diff --git a/src/file/fileindexscheduler.cpp b/src/file/fileindexscheduler.cpp
--- a/src/file/fileindexscheduler.cpp
+++ b/src/file/fileindexscheduler.cpp
@@ -248,6 +248,8 @@
         qCDebug(BALOO) << "Suspending";
         if (m_indexerState == ContentIndexing) {
             m_contentIndexer->quit();
+        } else {
+            scheduleIndexing();
         }
     } else {
         qCDebug(BALOO) << "Resuming";