diff --git a/apps/settings.c b/apps/settings.c
index 5357a950c4..2cdf14397e 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -984,11 +984,6 @@ bool set_int(char* string,
             case BUTTON_PLAY:
 #endif
                 done = true;
-                if (*variable != org_value) {
-                   lcd_stop_scroll();
-                   lcd_puts(0, 0, str(LANG_MENU_SETTING_OK));
-                   sleep(HZ/2);
-                }
                 break;
 
 #ifdef HAVE_RECORDER_KEYPAD
@@ -998,10 +993,11 @@ bool set_int(char* string,
             case BUTTON_MENU:
 #endif
                 if (*variable != org_value) {
-                   *variable=org_value;
-                   lcd_stop_scroll();
-                   lcd_puts(0, 0, str(LANG_MENU_SETTING_CANCEL));
-                   sleep(HZ/2);
+                    *variable=org_value;
+                    lcd_stop_scroll();
+                    lcd_puts(0, 0, str(LANG_MENU_SETTING_CANCEL));
+                    lcd_update();
+                    sleep(HZ/2);
                 }
                 done = true;
                 break;
@@ -1084,11 +1080,6 @@ bool set_option(char* string, int* variable, char* options[],
             case BUTTON_PLAY:
 #endif
                 done = true;
-                if (*variable != org_value) {
-                   lcd_stop_scroll();
-                   lcd_puts(0, 0, str(LANG_MENU_SETTING_OK));
-                   sleep(HZ/2);
-                }
                 break;
 
 #ifdef HAVE_RECORDER_KEYPAD
@@ -1098,10 +1089,11 @@ bool set_option(char* string, int* variable, char* options[],
             case BUTTON_MENU:
 #endif
                 if (*variable != org_value) {
-                   *variable=org_value;
-                   lcd_stop_scroll();
-                   lcd_puts(0, 0, str(LANG_MENU_SETTING_CANCEL));
-                   sleep(HZ/2);
+                    *variable=org_value;
+                    lcd_stop_scroll();
+                    lcd_puts(0, 0, str(LANG_MENU_SETTING_CANCEL));
+                    lcd_update();
+                    sleep(HZ/2);
                 }
                 done = true;
                 break;
diff --git a/apps/sleeptimer.c b/apps/sleeptimer.c
index b47d93698a..bd9ccc359b 100644
--- a/apps/sleeptimer.c
+++ b/apps/sleeptimer.c
@@ -74,11 +74,6 @@ bool sleeptimer_screen(void)
         case BUTTON_PLAY:
 #endif
           done = true;
-          if (changed) {
-            lcd_stop_scroll();
-            lcd_puts(0, 0, str(LANG_MENU_SETTING_OK));
-            sleep(HZ/2);
-          }
           break;
 
 #ifdef HAVE_RECORDER_KEYPAD
@@ -90,6 +85,7 @@ bool sleeptimer_screen(void)
           if (changed) {
             lcd_stop_scroll();
             lcd_puts(0, 0, str(LANG_MENU_SETTING_CANCEL));
+            lcd_update();
             set_sleep_timer(org_timer);
             sleep(HZ/2);
           }