diff --git a/client/ui/qml/Controls2/DrawerType.qml b/client/ui/qml/Controls2/DrawerType.qml
index 34b141b49..1c4c508f6 100644
--- a/client/ui/qml/Controls2/DrawerType.qml
+++ b/client/ui/qml/Controls2/DrawerType.qml
@@ -48,19 +48,19 @@ Drawer {
         if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
             PageController.updateNavigationBarColor(0xFF1C1D21)
         }
+    }
 
+    onOpened: {
         if (needCloseButton) {
             PageController.drawerOpen()
         }
     }
 
-    onAboutToHide: {
+    onClosed: {
         if (needCloseButton) {
             PageController.drawerClose()
         }
-    }
 
-    onClosed: {
         var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
         if (initialPageNavigationBarColor !== 0xFF1C1D21) {
             PageController.updateNavigationBarColor(initialPageNavigationBarColor)