diff --git a/sdrgui/gui/featurepresetsdialog.cpp b/sdrgui/gui/featurepresetsdialog.cpp
index 640ddcb46..aaf188d9c 100644
--- a/sdrgui/gui/featurepresetsdialog.cpp
+++ b/sdrgui/gui/featurepresetsdialog.cpp
@@ -28,7 +28,10 @@
 FeaturePresetsDialog::FeaturePresetsDialog(QWidget* parent) :
     QDialog(parent),
     ui(new Ui::FeaturePresetsDialog),
-    m_featureSetPresets(nullptr)
+    m_featureSetPresets(nullptr),
+    m_featureUISet(nullptr),
+    m_pluginAPI(nullptr),
+    m_apiAdapter(nullptr)
 {
     ui->setupUi(this);
 }
diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp
index 852a40ecd..d6a471ce9 100644
--- a/sdrgui/mainwindow.cpp
+++ b/sdrgui/mainwindow.cpp
@@ -230,6 +230,7 @@ MainWindow::MainWindow(qtwebapp::LoggerWithFile *logger, const MainParser& parse
     connect(ui->tabChannels, SIGNAL(currentChanged(int)), this, SLOT(tabChannelsIndexChanged()));
     connect(ui->channelDock, SIGNAL(addChannel(int)), this, SLOT(channelAddClicked(int)));
     connect(ui->inputViewDock, SIGNAL(deviceChanged(int, int, int)), this, SLOT(samplingDeviceChanged(int, int, int)));
+    connect(ui->tabFeatures, SIGNAL(currentChanged(int)), this, SLOT(tabFeaturesIndexChanged()));
     connect(ui->featureDock, SIGNAL(addFeature(int)), this, SLOT(featureAddClicked(int)));
 
 	QString applicationDirPath = qApp->applicationDirPath();
@@ -2287,6 +2288,12 @@ void MainWindow::tabChannelsIndexChanged()
     }
 }
 
+void MainWindow::tabFeaturesIndexChanged()
+{
+    int featuresTabIndex = ui->tabFeatures->currentIndex();
+    ui->featureDock->setFeatureUISet(m_featureUIs[featuresTabIndex]);
+}
+
 void MainWindow::updateStatus()
 {
     m_dateTimeWidget->setText(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss t"));
diff --git a/sdrgui/mainwindow.h b/sdrgui/mainwindow.h
index 0266ed34e..9a7e78323 100644
--- a/sdrgui/mainwindow.h
+++ b/sdrgui/mainwindow.h
@@ -190,6 +190,7 @@ private slots:
 	void on_action_removeLastFeatureSet_triggered();
 	void tabInputViewIndexChanged();
     void tabChannelsIndexChanged();
+	void tabFeaturesIndexChanged();
 	void commandKeyPressed(Qt::Key key, Qt::KeyboardModifiers keyModifiers, bool release);
 };