diff --git a/src/file/filecontentindexer.cpp b/src/file/filecontentindexer.cpp
index 98ced848..df28d1fb 100644
--- a/src/file/filecontentindexer.cpp
+++ b/src/file/filecontentindexer.cpp
@@ -1,116 +1,117 @@
 /*
  * Copyright (C) 2015  Vishesh Handa <vhanda@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
 
 #include "filecontentindexer.h"
 #include "filecontentindexerprovider.h"
 #include "extractorprocess.h"
 
 #include <QEventLoop>
 #include <QElapsedTimer>
 #include <QTimer>
 #include <QDBusConnection>
 
 using namespace Baloo;
 
 FileContentIndexer::FileContentIndexer(FileIndexerConfig* config, FileContentIndexerProvider* provider, QObject* parent)
     : QObject(parent)
     , m_config(config)
     , m_batchSize(config->maxUncomittedFiles())
     , m_provider(provider)
     , m_stop(0)
 {
     Q_ASSERT(provider);
 
     QDBusConnection bus = QDBusConnection::sessionBus();
     m_monitorWatcher.setConnection(bus);
     m_monitorWatcher.setWatchMode(QDBusServiceWatcher::WatchForUnregistration);
     connect(&m_monitorWatcher, &QDBusServiceWatcher::serviceUnregistered, this,
             &FileContentIndexer::monitorClosed);
 
     bus.registerObject(QStringLiteral("/fileindexer"),
                         this, QDBusConnection::ExportScriptableContents);
 }
 
 void FileContentIndexer::run()
 {
     ExtractorProcess process;
     connect(&process, &ExtractorProcess::startedIndexingFile, this, &FileContentIndexer::slotStartedIndexingFile);
-    connect(&process, &ExtractorProcess::startedIndexingFile, this, &FileContentIndexer::slotFinishedIndexingFile);
+    connect(&process, &ExtractorProcess::finishedIndexingFile, this, &FileContentIndexer::slotFinishedIndexingFile);
 
     m_stop.store(false);
     while (m_provider->size() && !m_stop.load()) {
         //
         // WARNING: This will go mad, if the Extractor does not commit after N=m_batchSize files
         // cause then we will keep fetching the same N files again and again.
         //
         QElapsedTimer timer;
         timer.start();
 
         QVector<quint64> idList = m_provider->fetch(m_batchSize);
         if (idList.isEmpty() || m_stop.load()) {
             break;
         }
         QEventLoop loop;
         connect(&process, &ExtractorProcess::done, &loop, &QEventLoop::quit);
 
         process.index(idList);
         loop.exec();
 
         // QDbus requires us to be in object creation thread (thread affinity)
         // This signal is not even exported, and yet QDbus complains. QDbus bug?
         QMetaObject::invokeMethod(this, "newBatchTime", Qt::QueuedConnection, Q_ARG(uint, timer.elapsed()));
     }
     QMetaObject::invokeMethod(this, "done", Qt::QueuedConnection);
 }
 
 void FileContentIndexer::slotStartedIndexingFile(const QString& filePath)
 {
     m_currentFile = filePath;
     if (!m_registeredMonitors.isEmpty()) {
         Q_EMIT startedIndexingFile(filePath);
     }
 }
 
 void FileContentIndexer::slotFinishedIndexingFile(const QString& filePath)
 {
     Q_UNUSED(filePath);
     if (!m_registeredMonitors.isEmpty()) {
         Q_EMIT finishedIndexingFile(filePath);
     }
+    m_currentFile = QString();
 }
 
 void FileContentIndexer::registerMonitor(const QDBusMessage& message)
 {
     if (!m_registeredMonitors.contains(message.service())) {
         m_registeredMonitors << message.service();
         m_monitorWatcher.addWatchedService(message.service());
     }
 }
 
 void FileContentIndexer::unregisterMonitor(const QDBusMessage& message)
 {
     m_registeredMonitors.removeAll(message.service());
     m_monitorWatcher.removeWatchedService(message.service());
 }
 
 void FileContentIndexer::monitorClosed(const QString& service)
 {
     m_registeredMonitors.removeAll(service);
     m_monitorWatcher.removeWatchedService(service);
 }