diff --git a/firmware/application/apps/gps_sim_app.cpp b/firmware/application/apps/gps_sim_app.cpp
index 6bb5683bf60dd2138a63bd43b3837cc532f6b377..fb7babc1ae08a9e8c595867e287a77efd6eba6bf 100644
--- a/firmware/application/apps/gps_sim_app.cpp
+++ b/firmware/application/apps/gps_sim_app.cpp
@@ -234,6 +234,8 @@ GpsSimAppView::~GpsSimAppView() {
 void GpsSimAppView::on_hide() {
 	// TODO: Terrible kludge because widget system doesn't notify Waterfall that
 	// it's being shown or hidden.
+	if( is_active() )
+		stop(false);
 	waterfall.on_hide();
 	View::on_hide();
 }