diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp
index 3fade3256..612fa3d08 100644
--- a/src/tomahawkapp.cpp
+++ b/src/tomahawkapp.cpp
@@ -241,6 +241,11 @@ TomahawkApp::init()
     tDebug() << "Init Scrobbler.";
     m_scrobbler = new Scrobbler( this );
 #endif
+
+    if ( arguments().contains( "--filescan" ) )
+    {
+        m_scanManager.data()->runScan( true );
+    }
 }