diff --git a/plugins/feature/aprs/aprsgui.cpp b/plugins/feature/aprs/aprsgui.cpp
index f251c9a44..906cf23b4 100644
--- a/plugins/feature/aprs/aprsgui.cpp
+++ b/plugins/feature/aprs/aprsgui.cpp
@@ -662,7 +662,7 @@ void APRSGUI::updateChannelList()
     ui->sourcePipes->blockSignals(false);
 }
 
-void APRSGUI::resizeEvent(QResizeEvent* size)
+void APRSGUI::resizeEvent(QResizeEvent*)
 {
     // Replot graphs to ensure Axis are visible
     plotWeather();
diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp
index d1a7faac9..9aa973555 100644
--- a/sdrgui/mainwindow.cpp
+++ b/sdrgui/mainwindow.cpp
@@ -433,7 +433,7 @@ void MainWindow::sampleSourceCreate(
         deviceGUI,
         &DeviceGUI::showSpectrum,
         this,
-        [=](int deviceSetIndex){ this->mainSpectrumShow(this->m_deviceUIs[deviceSetIndex]->m_mainSpectrumGUI); }
+        &MainWindow::mainSpectrumShow
     );
     QObject::connect(
         deviceGUI,
@@ -648,7 +648,7 @@ void MainWindow::sampleSinkCreate(
         deviceGUI,
         &DeviceGUI::showSpectrum,
         this,
-        [=](int deviceSetIndex){ this->mainSpectrumShow(this->m_deviceUIs[deviceSetIndex]->m_mainSpectrumGUI); }
+        &MainWindow::mainSpectrumShow
     );
     QObject::connect(
         deviceGUI,
@@ -837,7 +837,7 @@ void MainWindow::sampleMIMOCreate(
         deviceGUI,
         &DeviceGUI::showSpectrum,
         this,
-        [=](int deviceSetIndex){ this->mainSpectrumShow(this->m_deviceUIs[deviceSetIndex]->m_mainSpectrumGUI); }
+        &MainWindow::mainSpectrumShow
     );
     QObject::connect(
         deviceGUI,
@@ -973,6 +973,15 @@ void MainWindow::removeDeviceSet(int deviceSetIndex)
     {
         DeviceUISet *deviceUISet = m_deviceUIs[i];
         deviceUISet->setIndex(i);
+        DeviceGUI *deviceGUI = m_deviceUIs[i]->m_deviceGUI;
+        Workspace *deviceWorkspace = m_workspaces[deviceGUI->getWorkspaceIndex()];
+
+        QObject::connect(
+            deviceGUI,
+            &DeviceGUI::addChannelEmitted,
+            this,
+            [=](int channelPluginIndex){ this->channelAddClicked(deviceWorkspace, i, channelPluginIndex); }
+        );
     }
 
     emit m_mainCore->deviceSetRemoved(deviceSetIndex);
@@ -2572,10 +2581,11 @@ void MainWindow::mainSpectrumMove(MainSpectrumGUI *gui, int wsIndexDestnation)
     m_workspaces[wsIndexDestnation]->addToMdiArea(gui);
 }
 
-void MainWindow::mainSpectrumShow(MainSpectrumGUI *gui)
+void MainWindow::mainSpectrumShow(int deviceSetIndex)
 {
-    gui->show();
-    gui->raise();
+    DeviceUISet *deviceUISet = m_deviceUIs[deviceSetIndex];
+    deviceUISet->m_mainSpectrumGUI->show();
+    deviceUISet->m_mainSpectrumGUI->raise();
 }
 
 void MainWindow::showAllChannels(int deviceSetIndex)
diff --git a/sdrgui/mainwindow.h b/sdrgui/mainwindow.h
index e49fa6d9c..21488f49a 100644
--- a/sdrgui/mainwindow.h
+++ b/sdrgui/mainwindow.h
@@ -207,7 +207,7 @@ private slots:
     void openFeaturePresetsDialog(QPoint p, Workspace *workspace);
     void deviceMove(DeviceGUI *gui, int wsIndexDestnation);
     void mainSpectrumMove(MainSpectrumGUI *gui, int wsIndexDestnation);
-    void mainSpectrumShow(MainSpectrumGUI *gui);
+    void mainSpectrumShow(int deviceSetIndex);
     void showAllChannels(int deviceSetIndex);
     void openDeviceSetPresetsDialog(QPoint p, DeviceGUI *deviceGUI);
 	void commandKeyPressed(Qt::Key key, Qt::KeyboardModifiers keyModifiers, bool release);