diff --git a/src/musicscanner.cpp b/src/musicscanner.cpp
index 6ccbf14ae..d9404a18a 100644
--- a/src/musicscanner.cpp
+++ b/src/musicscanner.cpp
@@ -67,6 +67,8 @@ DirLister::scanDir( QDir dir, int depth, DirLister::Mode mode )
     
     foreach( const QFileInfo& di, dirs )
     {
+        qDebug() << "Considering dir " << di.absoluteFilePath();
+        qDebug() << "m_dirtimes contains it? " << (m_dirmtimes.contains( di.absoluteFilePath() ) ? "true" : "false");
         if( mode == DirLister::Recursive || !m_dirmtimes.contains( di.absoluteFilePath() ) )
             scanDir( di.absoluteFilePath(), depth + 1, DirLister::Recursive );
         else //should be the non-recursive case since the second test above should only happen with a new dir
diff --git a/src/scanmanager.cpp b/src/scanmanager.cpp
index 945d42987..0073c73b9 100644
--- a/src/scanmanager.cpp
+++ b/src/scanmanager.cpp
@@ -219,7 +219,8 @@ ScanManager::handleChangedDir( const QString& path )
 {
     qDebug() << Q_FUNC_INFO;
     qDebug() << "Dir changed: " << path;
-    m_queuedChangedDirs << path;
+    if( !m_queuedChangedDirs.contains( path ) )
+        m_queuedChangedDirs << path;
     if( TomahawkSettings::instance()->watchForChanges() )
         m_queuedScanTimer->start( 10000 );
 }