diff --git a/gps.c b/gps.c
index 0399987..c23175e 100644
--- a/gps.c
+++ b/gps.c
@@ -159,8 +159,6 @@ int32_t gps_app(void* p) {
 
                         gps_uart_init_thread(gps_uart);
                         gps_uart->changing_baudrate = true;
-                        view_port_update(view_port);
-                        furi_mutex_release(gps_uart->mutex);
                         break;
                     case InputKeyRight:
                         gps_uart->speed_units++;
@@ -177,10 +175,11 @@ int32_t gps_app(void* p) {
                 }
             }
         }
-        if(!gps_uart->changing_baudrate) {
-            view_port_update(view_port);
-            furi_mutex_release(gps_uart->mutex);
-        } else {
+
+        view_port_update(view_port);
+        furi_mutex_release(gps_uart->mutex);
+
+        if(gps_uart->changing_baudrate) {
             furi_delay_ms(1000);
             gps_uart->changing_baudrate = false;
         }