diff --git a/client/ui/qml/Controls2/DrawerType.qml b/client/ui/qml/Controls2/DrawerType.qml
index 4ea24091..72765d78 100644
--- a/client/ui/qml/Controls2/DrawerType.qml
+++ b/client/ui/qml/Controls2/DrawerType.qml
@@ -4,7 +4,6 @@ import QtQuick.Controls
 Drawer {
     id: drawer
     property bool needCloseButton: true
-    property bool isOpened: false
 
     Connections {
         target: PageController
@@ -53,16 +52,12 @@ Drawer {
     }
 
     onOpened: {
-        isOpened = true
-
         if (needCloseButton) {
             PageController.drawerOpen()
         }
     }
 
     onClosed: {
-        isOpened = false
-
         if (needCloseButton) {
             PageController.drawerClose()
         }
@@ -72,27 +67,4 @@ Drawer {
             PageController.updateNavigationBarColor(initialPageNavigationBarColor)
         }
     }
-
-
-    onPositionChanged: {
-        if (isOpened && (position <= 0.99 && position >= 0.95)) {
-            mouseArea.canceled()
-            drawer.close()
-            mouseArea.exited()
-            dropArea.exited()
-        }
-    }
-
-    DropArea {
-        id: dropArea
-    }
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-
-        onPressed: {
-            isOpened = true
-        }
-    }
 }
diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
index 61fff248..8a015e4c 100644
--- a/client/ui/qml/Pages2/PageHome.qml
+++ b/client/ui/qml/Pages2/PageHome.qml
@@ -26,6 +26,14 @@ PageType {
     property string defaultServerHostName: ServersModel.defaultServerHostName
     property string defaultContainerName: ContainersModel.defaultContainerName
 
+    MouseArea {
+        anchors.fill: parent
+        enabled: buttonContent.state === "expanded"
+        onClicked: {
+            buttonContent.state = "collapsed"
+        }
+    }
+
     Item {
         anchors.fill: parent
         anchors.bottomMargin: buttonContent.collapsedHeight
@@ -59,7 +67,7 @@ PageType {
         drag.target: buttonContent
         drag.axis: Drag.YAxis
         drag.maximumY: root.height - buttonContent.collapsedHeight
-        drag.minimumY: 100
+        drag.minimumY: root.height - root.height * 0.9
 
         onReleased: {
             if (buttonContent.state === "collapsed" && buttonContent.y < dragArea.drag.maximumY) {
@@ -71,6 +79,12 @@ PageType {
                 return
             }
         }
+
+        onClicked: {
+            if (buttonContent.state === "collapsed") {
+                buttonContent.state = "expanded"
+            }
+        }
     }
 
     Rectangle {
@@ -135,12 +149,12 @@ PageType {
 
         states: [
             State {
-            name: "collapsed"
-            PropertyChanges {
-                target: buttonContent
-                y: root.height - collapsedHeight
-            }
-        },
+                name: "collapsed"
+                PropertyChanges {
+                    target: buttonContent
+                    y: root.height - collapsedHeight
+                }
+            },
             State {
                 name: "expanded"
                 PropertyChanges {
@@ -148,7 +162,29 @@ PageType {
                     y: dragArea.drag.minimumY
 
                 }
-            }]
+            }
+        ]
+
+        transitions: [
+            Transition {
+                from: "collapsed"
+                to: "expanded"
+                PropertyAnimation {
+                    target: buttonContent
+                    properties: "y"
+                    duration: 200
+                }
+            },
+            Transition {
+                from: "expanded"
+                to: "collapsed"
+                PropertyAnimation {
+                    target: buttonContent
+                    properties: "y"
+                    duration: 200
+                }
+            }
+        ]
 
         RowLayout {
             Layout.topMargin: 24
@@ -309,7 +345,7 @@ PageType {
             Layout.fillWidth: true
             Layout.topMargin: 16
             contentHeight: col.implicitHeight
-            height: 500
+            implicitHeight: root.height - (root.height * 0.1) - serversMenuHeader.implicitHeight - 52 //todo 52 is tabbar height
             visible: buttonContent.expandedVisibility
             clip: true
 
@@ -333,7 +369,6 @@ PageType {
                     id: serversRadioButtonGroup
                 }
 
-
                 ListView {
                     id: serversMenuContent
                     width: parent.width