diff --git a/src/config.h b/src/config.h
index 9ed6468..14b098b 100644
--- a/src/config.h
+++ b/src/config.h
@@ -32,6 +32,6 @@
     /*
     * firmeware version string
     */
-    #define __FIRMWARE__            "2020081421"
+    #define __FIRMWARE__            "2020081422"
 
 #endif // _CONFIG_H
diff --git a/src/gui/mainbar/setup_tile/battery_settings/battery_view.cpp b/src/gui/mainbar/setup_tile/battery_settings/battery_view.cpp
index 9394e16..7e67aa1 100644
--- a/src/gui/mainbar/setup_tile/battery_settings/battery_view.cpp
+++ b/src/gui/mainbar/setup_tile/battery_settings/battery_view.cpp
@@ -45,7 +45,6 @@ LV_IMG_DECLARE(exit_32px);
 LV_IMG_DECLARE(setup_32px);
 
 static void enter_battery_settings_event_cb( lv_obj_t * obj, lv_event_t event );
-static void enter_battery_view_event_cb( lv_obj_t * obj, lv_event_t event );
 static void exit_battery_view_event_cb( lv_obj_t * obj, lv_event_t event );
 void battery_view_update_task( lv_task_t *task );
 void battery_activate_cb( void );
@@ -179,14 +178,6 @@ void battery_hibernate_cb( void ) {
     lv_task_del( battery_view_task );
 }
 
-static void enter_battery_view_event_cb( lv_obj_t * obj, lv_event_t event ) {
-    switch( event ) {
-        case( LV_EVENT_CLICKED ):       mainbar_jump_to_tilenumber( battery_view_tile_num, LV_ANIM_OFF );
-                                        break;
-    }
-
-}
-
 static void enter_battery_settings_event_cb( lv_obj_t * obj, lv_event_t event ) {
     switch( event ) {
         case( LV_EVENT_CLICKED ):       mainbar_jump_to_tilenumber( battery_view_tile_num + 1, LV_ANIM_OFF );
diff --git a/src/hardware/powermgm.cpp b/src/hardware/powermgm.cpp
index 277bc3a..bab5c90 100644
--- a/src/hardware/powermgm.cpp
+++ b/src/hardware/powermgm.cpp
@@ -74,10 +74,15 @@ void powermgm_loop( TTGOClass *ttgo ) {
         }
         powermgm_clear_event( POWERMGM_PMU_BUTTON | POWERMGM_BMA_DOUBLECLICK );
     }
-        
+
+    if ( powermgm_get_event( POWERMGM_WAKEUP_REQUEST ) && powermgm_get_event( POWERMGM_WAKEUP ) ) {
+        lv_disp_trig_activity( NULL );
+        powermgm_clear_event( POWERMGM_WAKEUP_REQUEST );
+    }
+  
     // drive into
     if ( powermgm_get_event( POWERMGM_SILENCE_WAKEUP_REQUEST | POWERMGM_WAKEUP_REQUEST ) ) {
-        powermgm_clear_event( POWERMGM_STANDBY | POWERMGM_SILENCE_WAKEUP );
+        powermgm_clear_event( POWERMGM_STANDBY | POWERMGM_SILENCE_WAKEUP | POWERMGM_WAKEUP );
 
         log_i("go wakeup");
 
@@ -103,10 +108,12 @@ void powermgm_loop( TTGOClass *ttgo ) {
         if ( powermgm_get_event( POWERMGM_SILENCE_WAKEUP_REQUEST ) ) {
             powermgm_set_event( POWERMGM_SILENCE_WAKEUP );
         }
+        else {
+            powermgm_set_event( POWERMGM_WAKEUP );
+        }
     }        
     else if( powermgm_get_event( POWERMGM_STANDBY_REQUEST ) ) {
-        powermgm_set_event( POWERMGM_STANDBY );
-        powermgm_clear_event( POWERMGM_SILENCE_WAKEUP );
+        powermgm_clear_event( POWERMGM_STANDBY | POWERMGM_SILENCE_WAKEUP | POWERMGM_WAKEUP );
 
         if ( !display_get_block_return_maintile() ) {
             mainbar_jump_to_maintile( LV_ANIM_OFF );
@@ -129,6 +136,8 @@ void powermgm_loop( TTGOClass *ttgo ) {
 
         adc_power_off();
 
+        powermgm_set_event( POWERMGM_STANDBY );
+
         if ( !blectl_get_enable_on_standby() ) {
             motor_vibe(3);
             delay(50);
diff --git a/ttgo-t-watch2020_v1.ino.bin b/ttgo-t-watch2020_v1.ino.bin
index 15bb0b2..41dc4df 100644
Binary files a/ttgo-t-watch2020_v1.ino.bin and b/ttgo-t-watch2020_v1.ino.bin differ
diff --git a/ttgo-t-watch2020_v1.version.json b/ttgo-t-watch2020_v1.version.json
index 48fea24..fabf40f 100644
--- a/ttgo-t-watch2020_v1.version.json
+++ b/ttgo-t-watch2020_v1.version.json
@@ -1 +1 @@
-{"version":"2020081421","host":"http://www.neo-guerillaz.de","file":"ttgo-t-watch2020_v1.ino.bin"}
+{"version":"2020081422","host":"http://www.neo-guerillaz.de","file":"ttgo-t-watch2020_v1.ino.bin"}