diff --git a/src/ui/QGCVehicleConfig.cc b/src/ui/QGCVehicleConfig.cc
index d38095a5cd1bf425f0fd9ea83746e498ec8689dc..318ef8d756329efccc9165f47564ee2f618d5a73 100644
--- a/src/ui/QGCVehicleConfig.cc
+++ b/src/ui/QGCVehicleConfig.cc
@@ -105,6 +105,7 @@ void QGCVehicleConfig::setActiveUAS(UASInterface* active)
         {
             delete tool;
         }
+        toolWidgets.clear();
     }
 
     // Reset current state