diff --git a/src/libtomahawk/TomahawkSettings.cpp b/src/libtomahawk/TomahawkSettings.cpp
index 31b86c0a4..588ac09e8 100644
--- a/src/libtomahawk/TomahawkSettings.cpp
+++ b/src/libtomahawk/TomahawkSettings.cpp
@@ -1524,6 +1524,12 @@ TomahawkSettings::setPrivateListeningMode( TomahawkSettings::PrivateListeningMod
 void
 TomahawkSettings::updateIndex()
 {
+    if ( !Database::instance() || !Database::instance()->isReady() )
+    {
+        QTimer::singleShot( 0, this, SLOT( updateIndex() ) );
+        return;
+    }
+
     Tomahawk::DatabaseCommand* cmd = new Tomahawk::DatabaseCommand_UpdateSearchIndex();
     Database::instance()->enqueue( QSharedPointer<Tomahawk::DatabaseCommand>( cmd ) );
 }
diff --git a/src/tomahawk/TomahawkApp.cpp b/src/tomahawk/TomahawkApp.cpp
index adb9d167d..fdf835a9a 100644
--- a/src/tomahawk/TomahawkApp.cpp
+++ b/src/tomahawk/TomahawkApp.cpp
@@ -79,7 +79,6 @@
 #include "dialogs/SettingsDialog.h"
 #include "ActionCollection.h"
 #include "widgets/HeaderLabel.h"
-#include "TomahawkSettings.h"
 #include "utils/TomahawkStyle.h"
 
 #include "config.h"