diff --git a/utils/system_daemon/daemon.cpp b/utils/system_daemon/daemon.cpp
index e0975b9f..08f7c2d4 100644
--- a/utils/system_daemon/daemon.cpp
+++ b/utils/system_daemon/daemon.cpp
@@ -285,8 +285,8 @@ void Daemon::fillInfoTile(const Daemon::HostInfo & hi) {
 
 
 void Daemon::tileEvent(PIScreenTile * t, TileEvent e) {
-	PIMutexLocker ml(remote_mutex);
 	if (t == list_daemons) {
+		PIMutexLocker ml(remote_mutex);
 		if (e.type == TileList::RowPressed) {
 			connectToDaemon(list_daemons->content[e.data.toInt()].first);
 			showActionList();
@@ -294,6 +294,7 @@ void Daemon::tileEvent(PIScreenTile * t, TileEvent e) {
 		return;
 	}
 	if (t == list_actions) {
+		PIMutexLocker ml(remote_mutex);
 		if (e.type == TileList::RowPressed) {
 			switch (e.data.toInt()) {
 			case 0: mode = 2; showTile(tile_info, "Information"); break;