diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index c748d46..6a48244 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -4949,7 +4949,7 @@ action:
                               #hvac_mode: 'heat'
                               temperature: "{{ new_setpoint }}"
 
-              #### Page Climate - Close Climate Page ##### TODO
+              #### Page Climate - Close Climate Page #####
               - conditions:
                   - condition: template
                     value_template: '{{ trigger.event.data.new_state.state == "releaseclimateclose" }}'
@@ -5259,6 +5259,26 @@ action:
           - condition: trigger
             id: current_page_changed
         sequence:
+          ##### climate-page left - apply climate temperature if climate_optimistic ##### ## TODO - remove from here
+          - if:
+              - condition: template
+                value_template: '{{ trigger.event.data.old_state.state == page_climate }}'
+            then:
+              - if:
+                  - condition: template
+                    value_template: '{{ climate_optimistic == true }}'
+                then:
+                  - variables:
+                      display_target_temperature: "{{states(display_target_temperature) | round(1)}}"
+                  - if:
+                      - condition: template
+                        value_template: '{{ display_target_temperature != 0.0 }}'
+                    then:
+                      - service: climate.set_temperature
+                        data:
+                          entity_id: '{{ entity_long }}'
+                          #hvac_mode: 'heat'
+                          temperature: "{{ display_target_temperature }}"
           - choose:
               ## PAGE HOME ## 
               - conditions: '{{ trigger.event.data.new_state.state == page_home }}'
@@ -5466,27 +5486,6 @@ action:
                   - service: "{{ command_printf }}"
                     data:
                       cmd: home.icon_top_02.pic={{ relay02_pic }}
-
-                  ##### climate-page left - apply climate temperature if climate_optimistic ##### ## TODO - remove from here
-                  - if:
-                      - condition: template
-                        value_template: '{{ trigger.event.data.old_state.state == page_climate }}'
-                    then:
-                      - if:
-                          - condition: template
-                            value_template: '{{ climate_optimistic == true }}'
-                        then:
-                          - variables:
-                              display_target_temperature: "{{states(display_target_temperature) | round(1)}}"
-                          - if:
-                              - condition: template
-                                value_template: '{{ display_target_temperature != 0.0 }}'
-                            then:
-                              - service: climate.set_temperature
-                                data:
-                                  entity_id: !input climate
-                                  #hvac_mode: 'heat'
-                                  temperature: "{{ display_target_temperature }}"
                   
                   ##### Set notify icon #####
                   - variables: