diff --git a/firmware/application/apps/analog_audio_app.cpp b/firmware/application/apps/analog_audio_app.cpp
index a0f395b3..de52c3a6 100644
--- a/firmware/application/apps/analog_audio_app.cpp
+++ b/firmware/application/apps/analog_audio_app.cpp
@@ -36,6 +36,8 @@ using namespace tonekey;
 
 #include "string_format.hpp"
 
+#include "freqman.hpp"
+
 namespace ui {
 
 /* AMOptionsView *********************************************************/
@@ -51,6 +53,7 @@ AMOptionsView::AMOptionsView(
 		&options_config,
 	});
 
+	freqman_set_bandwidth_option( AM_MODULATION , options_config );
 	options_config.set_selected_index(receiver_model.am_configuration());
 	options_config.on_change = [this](size_t n, OptionsField::value_t) {
 		receiver_model.set_am_configuration(n);
@@ -72,6 +75,7 @@ NBFMOptionsView::NBFMOptionsView(
 		&field_squelch
 	});
 
+	freqman_set_bandwidth_option( NFM_MODULATION , options_config );
 	options_config.set_selected_index(receiver_model.nbfm_configuration());
 	options_config.on_change = [this](size_t n, OptionsField::value_t) {
 		receiver_model.set_nbfm_configuration(n);
@@ -96,6 +100,7 @@ WFMOptionsView::WFMOptionsView(
 		&options_config,
 	});
 
+	freqman_set_bandwidth_option( WFM_MODULATION , options_config );
 	options_config.set_selected_index(receiver_model.wfm_configuration());
 	options_config.on_change = [this](size_t n, OptionsField::value_t) {
 		receiver_model.set_wfm_configuration(n);
diff --git a/firmware/application/apps/analog_audio_app.hpp b/firmware/application/apps/analog_audio_app.hpp
index 54a78cb3..329950b7 100644
--- a/firmware/application/apps/analog_audio_app.hpp
+++ b/firmware/application/apps/analog_audio_app.hpp
@@ -55,11 +55,6 @@ private:
 		{ 3 * 8, 0 * 16 },
 		5,
 		{
-			{ "DSB 9k ", 0 },
-			{ "DSB 6k ", 0 },
-			{ "USB+3k ", 0 },
-			{ "LSB-3k ", 0 },
-			{ "CW     ", 0 },
 		}
 	};
 };
@@ -77,9 +72,6 @@ private:
 		{ 3 * 8, 0 * 16 },
 		4,
 		{
-			{ " 8k5", 0 },
-			{ "11k ", 0 },
-			{ "16k ", 0 },
 		}
 	};
 	
@@ -110,9 +102,6 @@ private:
 		{ 3 * 8, 0 * 16 },
 		3,
 		{
-			{ "200K", 0 },
-			{ "180K", 1 },
-			{ " 40K", 2 },
 		}
 	};
 };
diff --git a/firmware/application/freqman.cpp b/firmware/application/freqman.cpp
index 63a90050..977cd803 100644
--- a/firmware/application/freqman.cpp
+++ b/firmware/application/freqman.cpp
@@ -47,6 +47,8 @@ options_t freqman_entry_bandwidths[ 4 ] = {
     },
     { //WFM
         { "200k" , 0 },
+        { "180K" , 1 },
+        { "40K"  , 2 },
     }
 };