diff --git a/src/comm/QGCMAVLink.cc b/src/comm/QGCMAVLink.cc
index 4637fe0277d511a167ad905e108e2a916feb3a4b..a6ea163e617229256b685b18de5aee1098e4b75a 100644
--- a/src/comm/QGCMAVLink.cc
+++ b/src/comm/QGCMAVLink.cc
@@ -16,7 +16,13 @@ bool QGCMAVLink::isFixedWing(MAV_TYPE mavType)
 
 bool QGCMAVLink::isRover(MAV_TYPE mavType)
 {
-    return mavType == MAV_TYPE_GROUND_ROVER;
+    switch (mavType) {
+    case MAV_TYPE_GROUND_ROVER:
+    case MAV_TYPE_SURFACE_BOAT:
+        return true;
+    default:
+        return false;
+    }
 }
 
 bool QGCMAVLink::isSub(MAV_TYPE mavType)