diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index d7386bb..a66a1df 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -3347,6 +3347,7 @@ trigger_variables:
   nspaneltemp: 'sensor.{{ nspanel_name }}_temperature'
   settings_entity: 'sensor.{{ nspanel_name }}_settings_entity'
   reboot_button: 'button.{{ nspanel_name }}_restart'
+  switch_sleep_mode: 'switch.{{ nspanel_name }}_sleep_modus'
 
   ##### notification Trigger #####
   notification_unread: 'switch.{{ nspanel_name }}_notification_unread'
@@ -4634,6 +4635,13 @@ trigger:
         path: !input 'tft_path'
       id: tft_upload
 
+  ##### Trigger - Sleep mode ###########################################################################################################
+    - platform: event
+      event_type: state_changed
+      event_data:
+        entity_id: "{{ switch_sleep_mode }}"
+      id: sleep_mode_state
+
 #############################################################
 ##### CLOSE - Trigger #####
 #############################################################
@@ -4722,7 +4730,7 @@ action:
               milliseconds: '{{ delay_value }}'
           - service: '{{ nextion.commands.printf }}'
             data:
-              cmd: page home
+              cmd: "page {{ nextion.pages.home }}"
             continue_on_error: true
 
       ##### NSPanel event #####
@@ -7336,6 +7344,21 @@ action:
             data: {}
             continue_on_error: true
 
+      ##### Wake-up when slee mode is disabled #####
+      - alias: Sleep mode changed
+        conditions:
+          - condition: trigger
+            id: sleep_mode_state
+          - "{{ nspanel_event.page == nextion.pages.screensaver }}"
+          - "{{ trigger.event.data.old_state.state == 'on' }}"
+          - "{{ trigger.event.data.new_state.state == 'off' }}"
+        sequence:
+          - *delay-default
+          - service: "{{ nextion.commands.printf }}"
+            data:
+              cmd: "page {{ nextion.pages.home }}"
+            continue_on_error: true
+
 
 #############################################################
 ##### CLOSE - Action #####