diff --git a/src/ui/QGCWaypointListMulti.cc b/src/ui/QGCWaypointListMulti.cc
index ce34b7188221750ca10de52c9ed5d139b053a9d0..cf3e2bc685670834959b73a77fc6d9de5fa20058 100644
--- a/src/ui/QGCWaypointListMulti.cc
+++ b/src/ui/QGCWaypointListMulti.cc
@@ -9,8 +9,8 @@ QGCWaypointListMulti::QGCWaypointListMulti(QWidget *parent) :
 {
     ui->setupUi(this);
     setMinimumSize(600, 80);
-    connect(UASManager::instance(), SIGNAL(UASCreated(UASInterface*)), this, SLOT(systemCreated(UASInterface*)));
-    connect(UASManager::instance(), SIGNAL(activeUASSet(int)), this, SLOT(systemSetActive(int)));
+    connect(UASManager::instance(), &UASManager::UASCreated, this, &QGCWaypointListMulti::systemCreated);
+    connect(UASManager::instance(), &UASManager::activeUASSet, this, &QGCWaypointListMulti::systemSetActive);
 
     WaypointList* list = new WaypointList(ui->stackedWidget, UASManager::instance()->getActiveUASWaypointManager());
     lists.insert(offline_uas_id, list);
@@ -18,7 +18,7 @@ QGCWaypointListMulti::QGCWaypointListMulti(QWidget *parent) :
 
     if (UASManager::instance()->getActiveUAS()) {
         systemCreated(UASManager::instance()->getActiveUAS());
-        systemSetActive(UASManager::instance()->getActiveUAS()->getUASID());
+        systemSetActive(UASManager::instance()->getActiveUAS());
     }
 
 }
@@ -50,9 +50,9 @@ void QGCWaypointListMulti::systemCreated(UASInterface* uas)
     connect(uas, SIGNAL(destroyed(QObject*)), this, SLOT(systemDeleted(QObject*)));
 }
 
-void QGCWaypointListMulti::systemSetActive(int uas)
+void QGCWaypointListMulti::systemSetActive(UASInterface* uas)
 {
-    WaypointList* list = lists.value(uas, NULL);
+    WaypointList* list = lists.value(uas->getUASID(), NULL);
     if (list) {
         ui->stackedWidget->setCurrentWidget(list);
     }
diff --git a/src/ui/QGCWaypointListMulti.h b/src/ui/QGCWaypointListMulti.h
index 392d79ec1ef197b4bd00c913c2ab14126a02c9db..774f385e40e23b6edcda04ff893f28e4e07ee6b5 100644
--- a/src/ui/QGCWaypointListMulti.h
+++ b/src/ui/QGCWaypointListMulti.h
@@ -23,7 +23,7 @@ public:
 public slots:
     void systemDeleted(QObject* uas);
     void systemCreated(UASInterface* uas);
-    void systemSetActive(int uas);
+    void systemSetActive(UASInterface* uas);
 
 protected:
     quint16 offline_uas_id;