diff --git a/firmware/application/analog_audio_app.cpp b/firmware/application/analog_audio_app.cpp
index 7dd4c6d3..f6fd732e 100644
--- a/firmware/application/analog_audio_app.cpp
+++ b/firmware/application/analog_audio_app.cpp
@@ -217,8 +217,6 @@ void AnalogAudioView::set_options_widget(std::unique_ptr<Widget> new_widget) {
 }
 
 void AnalogAudioView::on_show_options_frequency() {
-	field_frequency.set_style(&style_options_group);
-
 	auto widget = std::make_unique<FrequencyOptionsView>(options_view_rect, &style_options_group);
 
 	widget->set_step(receiver_model.frequency_step());
@@ -231,11 +229,10 @@ void AnalogAudioView::on_show_options_frequency() {
 	};
 
 	set_options_widget(std::move(widget));
+	field_frequency.set_style(&style_options_group);
 }
 
 void AnalogAudioView::on_show_options_rf_gain() {
-	field_lna.set_style(&style_options_group);
-
 	auto widget = std::make_unique<RadioGainOptionsView>(options_view_rect, &style_options_group);
 
 	widget->set_rf_amp(receiver_model.rf_amp());
@@ -244,19 +241,20 @@ void AnalogAudioView::on_show_options_rf_gain() {
 	};
 
 	set_options_widget(std::move(widget));
+	field_lna.set_style(&style_options_group);
 }
 
 void AnalogAudioView::on_show_options_modulation() {
 	const auto modulation = static_cast<ReceiverModel::Mode>(receiver_model.modulation());
 	if( modulation == ReceiverModel::Mode::AMAudio ) {
-		options_modulation.set_style(&style_options_group);
 		auto widget = std::make_unique<AMOptionsView>(options_view_rect, &style_options_group);
 		set_options_widget(std::move(widget));
+		options_modulation.set_style(&style_options_group);
 	}
 	if( modulation == ReceiverModel::Mode::NarrowbandFMAudio ) {
-		options_modulation.set_style(&style_options_group);
 		auto widget = std::make_unique<NBFMOptionsView>(options_view_rect, &style_options_group);
 		set_options_widget(std::move(widget));
+		options_modulation.set_style(&style_options_group);
 	}
 }