diff --git a/src/AnalyzeView/MAVLinkInspectorController.cc b/src/AnalyzeView/MAVLinkInspectorController.cc
index d0a56d2c8fb6228ff233b4f05b24228cd337360e..276970365464929756f14a8589ffdfcb1f7509e8 100644
--- a/src/AnalyzeView/MAVLinkInspectorController.cc
+++ b/src/AnalyzeView/MAVLinkInspectorController.cc
@@ -531,8 +531,8 @@ messages_sort(QObject* a, QObject* b)
     QGCMAVLinkMessage* aa = qobject_cast<QGCMAVLinkMessage*>(a);
     QGCMAVLinkMessage* bb = qobject_cast<QGCMAVLinkMessage*>(b);
     if(!aa || !bb) return false;
-    if(aa->id() == bb->id()) return aa->cid() < bb->cid();
-    return aa->id() < bb->id();
+    if(aa->name() == bb->name()) return aa->name() < bb->name();
+    return aa->name() < bb->name();
 }
 
 //-----------------------------------------------------------------------------