diff --git a/src/ui/preferences/MockLinkSettings.qml b/src/ui/preferences/MockLinkSettings.qml
index a5dad346b7fa476f3718398c3c0234fea3f2b206..1800d12a3445bc118d5819a1f0b247f98aa90ef3 100644
--- a/src/ui/preferences/MockLinkSettings.qml
+++ b/src/ui/preferences/MockLinkSettings.qml
@@ -24,9 +24,14 @@ Item {
 
     function saveSettings() {
         if(px4Firmware.checked)
-            subEditConfig.firmware = 12
-        else if(apmFirmware.checked)
+            subEditConfig.firmware = 12         // Hardcoded MAV_AUTOPILOT_PX4
+        else if(apmFirmware.checked) {
             subEditConfig.firmware = 3
+            if(planeVehicle.checked)
+                subEditConfig.vehicle = 1       // Hardcoded MAV_TYPE_FIXED_WING
+            else
+                subEditConfig.vehicle = 2       // Hardcoded MAV_TYPE_QUADROTOR
+        }
         else
             subEditConfig.firmware = 0
         subEditConfig.sendStatus = sendStatus.checked