1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index b0f6f28b..1bb9ba4d 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -154,6 +154,9 @@ App::attach(SPtr<SigClientInterface> client)
 	_client = client;
 	_store  = SPtr<ClientStore>(new ClientStore(_world->uris(), _world->log(), client));
 	_loader = SPtr<ThreadedLoader>(new ThreadedLoader(*this, _world->interface()));
+	if (!_world->store()) {
+		_world->set_store(_store);
+	}
 
 	_graph_tree_window->init(*this, *_store);