diff --git a/src/c/main.c b/src/c/main.c
index da50874..55f67fe 100644
--- a/src/c/main.c
+++ b/src/c/main.c
@@ -117,12 +117,16 @@ static void click_handler_skip_update_notification(void *recognizer, void *ctx)
 
 static void click_handler_push_setter(void *recognizer, void *ctx) {
 	s_highlight_pos = 0;
-	s_skip_current_day = true;        // setting the next alarm should assume the user meant tomorrow
 	s_alarm_reason = WAKE_MAIN_ALARM; // going back to setter means alarm was disarmed or failed to set; do not punish user
 	window_stack_pop_all(true);
 	push_setter_window();
 }
 
+static void click_handler_push_setter_skip_current_day(void *recognizer, void *ctx) {
+	s_skip_current_day = true; // setting the next alarm should assume the user meant tomorrow
+	click_handler_push_setter(recognizer, ctx);
+}
+
 static void click_handler_exit(void *recognizer, void *ctx) {
 	window_stack_pop_all(true);
 }
@@ -137,7 +141,7 @@ static void status_main_tutorial_click_config_provider(void *ctx) {
 }
 
 static void status_confirmation_click_config_provider(void *ctx) {
-	window_single_click_subscribe(BUTTON_ID_BACK, click_handler_push_setter);
+	window_single_click_subscribe(BUTTON_ID_BACK, click_handler_push_setter_skip_current_day);
 	window_single_click_subscribe(BUTTON_ID_SELECT, click_handler_exit);
 }