diff --git a/client/server_scripts/install_docker.sh b/client/server_scripts/install_docker.sh
index d8284dfd..e780dac5 100644
--- a/client/server_scripts/install_docker.sh
+++ b/client/server_scripts/install_docker.sh
@@ -5,9 +5,9 @@ else echo "Packet manager not found"; exit 1; fi;\
 echo "Dist: $dist, Packet manager: $pm, Docker pkg: $docker_pkg";\
 if [ "$dist" = "debian" ]; then export DEBIAN_FRONTEND=noninteractive; fi;\
 if ! command -v sudo > /dev/null 2>&1; then $pm update -yq; $pm install -yq sudo; fi;\
-if ! command -v fuser > /dev/null 2>&1; then $pm install -yq psmisc; fi;\
-if ! command -v lsof > /dev/null 2>&1; then $pm install -yq lsof; fi;\
-if ! command -v docker > /dev/null 2>&1; then $pm update -yq; $pm install -yq $docker_pkg;\
+if ! command -v fuser > /dev/null 2>&1; then sudo $pm install -yq psmisc; fi;\
+if ! command -v lsof > /dev/null 2>&1; then sudo $pm install -yq lsof; fi;\
+if ! command -v docker > /dev/null 2>&1; then sudo $pm update -yq; sudo $pm install -yq $docker_pkg;\
   if [ "$dist" = "fedora" ] || [ "$dist" = "debian" ]; then sudo systemctl enable docker && sudo systemctl start docker; fi;\
 fi;\
 if [ "$dist" = "debian" ]; then \
@@ -17,4 +17,3 @@ if [ "$dist" = "debian" ]; then \
 fi;\
 if ! command -v sudo > /dev/null 2>&1; then echo "Failed to install Docker";exit 1;fi;\
 docker --version
-
diff --git a/client/ui/qml/Controls2/TopCloseButtonType.qml b/client/ui/qml/Controls2/TopCloseButtonType.qml
index 4a738214..e29b0be4 100644
--- a/client/ui/qml/Controls2/TopCloseButtonType.qml
+++ b/client/ui/qml/Controls2/TopCloseButtonType.qml
@@ -5,6 +5,8 @@ import QtQuick.Shapes
 Popup {
     id: root
 
+    property alias buttonWidth: button.implicitWidth
+
     modal: false
     closePolicy: Popup.NoAutoClose
     padding: 4
@@ -20,6 +22,8 @@ Popup {
     }
 
     ImageButtonType {
+        id: button
+
         image: "qrc:/images/svg/close_black_24dp.svg"
         imageColor: "#D7D8DB"
 
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index 99132bf1..4af774fa 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -136,6 +136,11 @@ PageType {
             ServersModel.currentlyProcessedIndex = ServersModel.defaultIndex
             tabBarStackView.push(pagePath, { "objectName" : pagePath })
         }
+
+        onWidthChanged: {
+            topCloseButton.x = tabBarStackView.x + tabBarStackView.width -
+                    topCloseButton.buttonWidth - topCloseButton.rightPadding
+        }
     }
 
     TabBar {
@@ -231,7 +236,7 @@ PageType {
 
     TopCloseButtonType {
         id: topCloseButton
-        x: tabBarStackView.width - topCloseButton.width
+        x: tabBarStackView.width - topCloseButton.buttonWidth - topCloseButton.rightPadding
         z: 1
     }