diff --git a/src/domain/datasourcequeries.h b/src/domain/datasourcequeries.h
--- a/src/domain/datasourcequeries.h
+++ b/src/domain/datasourcequeries.h
@@ -72,9 +72,6 @@
     virtual void setSearchTerm(const QString &term) = 0;
     virtual QueryResult<DataSource::Ptr>::Ptr findSearchTopLevel() const = 0;
     virtual QueryResult<DataSource::Ptr>::Ptr findSearchChildren(DataSource::Ptr source) const = 0;
-
-private:
-    mutable QScopedPointer<DataSourceQueriesNotifier> m_notifier;
 };
 
 }
diff --git a/src/domain/datasourcequeries.cpp b/src/domain/datasourcequeries.cpp
--- a/src/domain/datasourcequeries.cpp
+++ b/src/domain/datasourcequeries.cpp
@@ -26,6 +26,8 @@
 
 using namespace Domain;
 
+Q_GLOBAL_STATIC(DataSourceQueriesNotifier, s_notifier)
+
 DataSourceQueries::DataSourceQueries()
 {
 }
@@ -36,10 +38,7 @@
 
 DataSourceQueriesNotifier *DataSourceQueries::notifier() const
 {
-    if (!m_notifier)
-        m_notifier.reset(new DataSourceQueriesNotifier);
-
-    return m_notifier.data();
+    return s_notifier();
 }
 
 void DataSourceQueries::setDefaultSource(DataSource::Ptr source)