diff --git a/src/fragment_store/message_fragment_store.cpp b/src/fragment_store/message_fragment_store.cpp
index fffa084f..e61112d5 100644
--- a/src/fragment_store/message_fragment_store.cpp
+++ b/src/fragment_store/message_fragment_store.cpp
@@ -250,8 +250,6 @@ MessageFragmentStore::MessageFragmentStore(
 	_sc.registerDeSerializerJson<Message::Components::Transfer::FileInfoLocal>();
 	_sc.registerSerializerJson<Message::Components::Transfer::TagHaveAll>();
 	_sc.registerDeSerializerJson<Message::Components::Transfer::TagHaveAll>();
-
-	_fs.scanStoragePath("test_message_store/");
 }
 
 MessageFragmentStore::~MessageFragmentStore(void) {
@@ -313,6 +311,10 @@ float MessageFragmentStore::tick(float time_delta) {
 	return 1000.f*60.f*60.f;
 }
 
+void MessageFragmentStore::triggerScan(void) {
+	_fs.scanStoragePath("test_message_store/");
+}
+
 bool MessageFragmentStore::onEvent(const Message::Events::MessageConstruct& e) {
 	handleMessage(e.e);
 	return false;
diff --git a/src/fragment_store/message_fragment_store.hpp b/src/fragment_store/message_fragment_store.hpp
index 80939486..39357a5a 100644
--- a/src/fragment_store/message_fragment_store.hpp
+++ b/src/fragment_store/message_fragment_store.hpp
@@ -71,6 +71,8 @@ class MessageFragmentStore : public RegistryMessageModelEventI {
 
 		float tick(float time_delta);
 
+		void triggerScan(void);
+
 	protected: // rmm
 		bool onEvent(const Message::Events::MessageConstruct& e) override;
 		bool onEvent(const Message::Events::MessageUpdated& e) override;
diff --git a/src/main_screen.cpp b/src/main_screen.cpp
index a17fd2d4..ba61d9c1 100644
--- a/src/main_screen.cpp
+++ b/src/main_screen.cpp
@@ -80,6 +80,8 @@ MainScreen::MainScreen(SDL_Renderer* renderer_, std::string save_path, std::stri
 	}
 
 	conf.dump();
+
+	mfs.triggerScan(); // HACK: after plugins and tox contacts got loaded
 }
 
 MainScreen::~MainScreen(void) {