diff --git a/MAVProxy/modules/mavproxy_link.py b/MAVProxy/modules/mavproxy_link.py
index af734a965961ff6bc5efeb4fa468a56a3d324f56..7a51e7ec47e49c1369b22cde767c3d744eb238c7 100644
--- a/MAVProxy/modules/mavproxy_link.py
+++ b/MAVProxy/modules/mavproxy_link.py
@@ -351,7 +351,14 @@ class LinkModule(mp_module.MPModule):
             if master.flightmode != self.status.flightmode:
                 self.status.flightmode = master.flightmode
                 if self.mpstate.functions.input_handler is None:
-                    self.set_prompt(self.status.flightmode + "> ")
+                    sysid = m.get_srcSystem()
+                    if sysid is None:
+                        sysid = ""
+                    else:
+                        sysid = str(int(sysid)) + ":"
+
+                    if self.mpstate.functions.input_handler is None:
+                        self.mpstate.rl.set_prompt(sysid + self.status.flightmode + "> ")
 
             if master.flightmode != self.status.last_mode_announced and time.time() > self.status.last_mode_announce + 2:
                     self.status.last_mode_announce = time.time()