diff --git a/client/ui/qml/Controls2/DrawerType.qml b/client/ui/qml/Controls2/DrawerType.qml
index c22d00c24..07e05f43e 100644
--- a/client/ui/qml/Controls2/DrawerType.qml
+++ b/client/ui/qml/Controls2/DrawerType.qml
@@ -50,24 +50,22 @@ Drawer {
         if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
             PageController.updateNavigationBarColor(0xFF1C1D21)
         }
+    }
 
+    onOpened: {
+        isOpened = true
+        
         if (needCloseButton) {
             PageController.drawerOpen()
         }
     }
 
-    onAboutToHide: {
+    onClosed: {
+        isOpened = false
+        
         if (needCloseButton) {
             PageController.drawerClose()
         }
-    }
-
-    onOpened: {
-        isOpened = true
-    }
-
-    onClosed: {
-        isOpened = false
 
         var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
         if (initialPageNavigationBarColor !== 0xFF1C1D21) {