diff --git a/conf/tools/messages.xml b/conf/tools/messages.xml
index e3a5d64bce..5ade8c924c 100644
--- a/conf/tools/messages.xml
+++ b/conf/tools/messages.xml
@@ -1,2 +1 @@
-<program command="sw/ground_segment/tmtc/messages" name="Messages" />
-
+<program command="sw/ground_segment/messages-gui/messages.py" name="Messages" />
diff --git a/conf/tools/messages_legacy.xml b/conf/tools/messages_legacy.xml
new file mode 100644
index 0000000000..1406769bd2
--- /dev/null
+++ b/conf/tools/messages_legacy.xml
@@ -0,0 +1 @@
+<program command="sw/ground_segment/tmtc/messages" name="Messages (Legacy)" />
diff --git a/sw/ground_segment/messages-gui/msgRecord/qtMessageModel.py b/sw/ground_segment/messages-gui/msgRecord/qtMessageModel.py
index 421412a171..4bf3c418eb 100644
--- a/sw/ground_segment/messages-gui/msgRecord/qtMessageModel.py
+++ b/sw/ground_segment/messages-gui/msgRecord/qtMessageModel.py
@@ -487,7 +487,7 @@ class MessageClassItem(QStandardItem):
             
             self.appendRow(newitems)
             
-            print(f"Added row for {name}")
+            # print(f"Added row for {name}")
 
         msgReceptionItem.setData(dt,Qt.ItemDataRole.UserRole)
         msgReceptionItem.setText(f" {dt:.0f}s ({freq:.1f} Hz) ")
@@ -579,9 +579,17 @@ class SenderItem(QStandardItem):
         except KeyError:
             return
         
-        for msg in msgDict.values():
-            self.updateMessage(msg)
-            
+        try:
+            for msg in msgDict.values():
+                self.updateMessage(msg)
+        except RuntimeError:
+            time.sleep(0.1) # Wait a bit and retry
+            try:
+                for msg in msgDict.values():
+                    self.updateMessage(msg)
+            except RuntimeError:
+                # Give up
+                return
 
 #################### Model ####################