diff --git a/client/ui/qml/Controls2/DrawerType.qml b/client/ui/qml/Controls2/DrawerType.qml
index 2b70ef3c..34b141b4 100644
--- a/client/ui/qml/Controls2/DrawerType.qml
+++ b/client/ui/qml/Controls2/DrawerType.qml
@@ -48,20 +48,19 @@ Drawer {
         if (PageController.getInitialPageNavigationBarColor() !== 0xFF1C1D21) {
             PageController.updateNavigationBarColor(0xFF1C1D21)
         }
-    }
 
-    onOpened: {
         if (needCloseButton) {
             PageController.drawerOpen()
         }
     }
 
-
-    onClosed: {
+    onAboutToHide: {
         if (needCloseButton) {
             PageController.drawerClose()
         }
+    }
 
+    onClosed: {
         var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
         if (initialPageNavigationBarColor !== 0xFF1C1D21) {
             PageController.updateNavigationBarColor(initialPageNavigationBarColor)
diff --git a/client/ui/qml/Controls2/TopCloseButtonType.qml b/client/ui/qml/Controls2/TopCloseButtonType.qml
index cd1406c4..ed89b5a6 100644
--- a/client/ui/qml/Controls2/TopCloseButtonType.qml
+++ b/client/ui/qml/Controls2/TopCloseButtonType.qml
@@ -7,8 +7,6 @@ Popup {
 
     modal: false
     closePolicy: Popup.NoAutoClose
-    width: 40
-    height: 40
     padding: 4
 
     visible: false
@@ -25,9 +23,6 @@ Popup {
         image: "qrc:/images/svg/close_black_24dp.svg"
         imageColor: "#D7D8DB"
 
-        implicitWidth: 32
-        implicitHeight: 32
-
         onClicked: {
             PageController.goToDrawerRootPage()
         }