diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp
index 4dbce3af1..02994878e 100644
--- a/sdrgui/mainwindow.cpp
+++ b/sdrgui/mainwindow.cpp
@@ -2213,6 +2213,18 @@ void MainWindow::on_action_removeLastDevice_triggered()
     }
 }
 
+void MainWindow::on_action_addFeatureSet_triggered()
+{
+    addFeatureSet();
+}
+
+void MainWindow::on_action_removeLastFeatureSet_triggered()
+{
+    if (m_featureUIs.size() > 1) {
+        removeFeatureSet(m_featureUIs.size() - 1);
+    }
+}
+
 void MainWindow::tabInputViewIndexChanged()
 {
     int inputViewIndex = ui->tabInputsView->currentIndex();
diff --git a/sdrgui/mainwindow.h b/sdrgui/mainwindow.h
index 654007946..0266ed34e 100644
--- a/sdrgui/mainwindow.h
+++ b/sdrgui/mainwindow.h
@@ -186,6 +186,8 @@ private slots:
 	void on_action_addSinkDevice_triggered();
     void on_action_addMIMODevice_triggered();
 	void on_action_removeLastDevice_triggered();
+	void on_action_addFeatureSet_triggered();
+	void on_action_removeLastFeatureSet_triggered();
 	void tabInputViewIndexChanged();
     void tabChannelsIndexChanged();
 	void commandKeyPressed(Qt::Key key, Qt::KeyboardModifiers keyModifiers, bool release);
diff --git a/sdrgui/mainwindow.ui b/sdrgui/mainwindow.ui
index 5d77ba6d8..d48c3bffa 100644
--- a/sdrgui/mainwindow.ui
+++ b/sdrgui/mainwindow.ui
@@ -130,9 +130,17 @@
     <addaction name="action_LimeRFE"/>
     <addaction name="menuDevices"/>
    </widget>
+   <widget class="QMenu" name="menuFeatureSets">
+    <property name="title">
+     <string>F&amp;eatureSets</string>
+    </property>
+    <addaction name="action_addFeatureSet"/>
+    <addaction name="action_removeLastFeatureSet"/>
+   </widget>
    <addaction name="menu_File"/>
    <addaction name="menu_View"/>
    <addaction name="menu_Devices"/>
+   <addaction name="menuFeatureSets"/>
    <addaction name="menu_Window"/>
    <addaction name="menuPreferences"/>
    <addaction name="menu_Help"/>
@@ -940,6 +948,30 @@
     <string>LimeRFE</string>
    </property>
   </action>
+  <action name="action_addFeatureSet">
+   <property name="text">
+    <string>Add feature set</string>
+   </property>
+   <property name="font">
+    <font>
+     <family>Liberation Sans</family>
+     <pointsize>9</pointsize>
+     <weight>50</weight>
+     <bold>false</bold>
+    </font>
+   </property>
+  </action>
+  <action name="action_removeLastFeatureSet">
+   <property name="text">
+    <string>Remove last feature set</string>
+   </property>
+   <property name="font">
+    <font>
+     <family>Liberation Sans</family>
+     <pointsize>9</pointsize>
+    </font>
+   </property>
+  </action>
   <zorder>presetDock</zorder>
   <zorder>channelDock</zorder>
   <zorder>commandsDock</zorder>