diff --git a/src/ui/HSIDisplay.cc b/src/ui/HSIDisplay.cc
index 736b5f27956992208974ab87ee35c994c4388536..624353d1607dafe8fd976a625a7df32451496b71 100644
--- a/src/ui/HSIDisplay.cc
+++ b/src/ui/HSIDisplay.cc
@@ -178,6 +178,8 @@ HSIDisplay::HSIDisplay(QWidget *parent) :
     connect(&statusClearTimer, SIGNAL(timeout()), this, SLOT(clearStatusMessage()));
     statusClearTimer.start(3000);
 
+    setActiveUAS(UASManager::instance()->getActiveUAS());
+
     setFocusPolicy(Qt::StrongFocus);
 }
 
diff --git a/src/ui/QGCWaypointListMulti.cc b/src/ui/QGCWaypointListMulti.cc
index 53a0065dff5491e45e413c9e8fee843996271c52..9cbe050d7449e007e16a0c810cd18445e89a51d7 100644
--- a/src/ui/QGCWaypointListMulti.cc
+++ b/src/ui/QGCWaypointListMulti.cc
@@ -15,6 +15,12 @@ QGCWaypointListMulti::QGCWaypointListMulti(QWidget *parent) :
     WaypointList* list = new WaypointList(ui->stackedWidget, NULL);
     lists.insert(offline_uas_id, list);
     ui->stackedWidget->addWidget(list);
+
+    if (UASManager::instance()->getActiveUAS()) {
+        systemCreated(UASManager::instance()->getActiveUAS());
+        systemSetActive(UASManager::instance()->getActiveUAS()->getUASID());
+    }
+
 }
 
 void QGCWaypointListMulti::systemDeleted(QObject* uas)