diff --git a/src/ui_bagl.c b/src/ui_bagl.c
index 5a17fccb..e84f6ec5 100644
--- a/src/ui_bagl.c
+++ b/src/ui_bagl.c
@@ -48,7 +48,7 @@ void ux_set_low_cost_display_mode(bool enable) {
         if (G_display.low_cost_display_mode) {
             ux_screensaver_start_clock();
         } else {
-            ux_screensaver_stop_clock();
+            ux_screensaver_stop();
         }
     }
 }
diff --git a/src/ui_screensaver.c b/src/ui_screensaver.c
index 211f27ee..b15a3359 100644
--- a/src/ui_screensaver.c
+++ b/src/ui_screensaver.c
@@ -69,12 +69,17 @@ static void ux_layout_blank_init(unsigned int stack_slot) {
     ux_stack_display(stack_slot);
 }
 
+void ux_screensaver_stop(void) {
+    G_screensaver_state.on = false;
+    ux_screensaver_stop_clock();
+}
+
 /**
  * @brief Exits the blank screen to home screen
  *
  */
 static void return_to_idle(void) {
-    G_screensaver_state.on = false;
+    ux_screensaver_stop();
     ui_initial_screen();
 }
 
diff --git a/src/ui_screensaver.h b/src/ui_screensaver.h
index 48c10f4b..9e24a753 100644
--- a/src/ui_screensaver.h
+++ b/src/ui_screensaver.h
@@ -47,6 +47,12 @@ typedef struct {
  */
 void ui_start_screensaver(void);
 
+/**
+ * @brief Stop using the screensaver
+ *
+ */
+void ux_screensaver_stop(void);
+
 /**
  * @brief Start a timeout before saving screen
  *