diff --git a/client/ui/controllers/pageController.h b/client/ui/controllers/pageController.h
index 9118cca8..2f4f6739 100644
--- a/client/ui/controllers/pageController.h
+++ b/client/ui/controllers/pageController.h
@@ -110,6 +110,7 @@ signals:
 
     void showBusyIndicator(bool visible);
     void disableControls(bool disabled);
+    void disableTabBar(bool disabled);
 
     void hideMainWindow();
     void raiseMainWindow();
diff --git a/client/ui/qml/Pages2/PageDeinstalling.qml b/client/ui/qml/Pages2/PageDeinstalling.qml
index 172af8ac..15633fa0 100644
--- a/client/ui/qml/Pages2/PageDeinstalling.qml
+++ b/client/ui/qml/Pages2/PageDeinstalling.qml
@@ -14,8 +14,8 @@ import "../Config"
 PageType {
     id: root
 
-    Component.onCompleted: PageController.disableControls(true)
-    Component.onDestruction: PageController.disableControls(false)
+    Component.onCompleted: PageController.disableTabBar(true)
+    Component.onDestruction: PageController.disableTabBar(false)
 
     SortFilterProxyModel {
         id: proxyServersModel
diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
index f997a489..6b6e79c6 100644
--- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml
@@ -14,8 +14,8 @@ import "../Config"
 PageType {
     id: root
 
-    Component.onCompleted: PageController.disableControls(true)
-    Component.onDestruction: PageController.disableControls(false)
+    Component.onCompleted: PageController.disableTabBar(true)
+    Component.onDestruction: PageController.disableTabBar(false)
 
     property bool isTimerRunning: true
     property string progressBarText: qsTr("Usually it takes no more than 5 minutes")
diff --git a/client/ui/qml/Pages2/PageSetupWizardStart.qml b/client/ui/qml/Pages2/PageSetupWizardStart.qml
index b4d86326..1a2b970e 100644
--- a/client/ui/qml/Pages2/PageSetupWizardStart.qml
+++ b/client/ui/qml/Pages2/PageSetupWizardStart.qml
@@ -48,6 +48,10 @@ PageType {
             isControlsDisabled = disabled
         }
 
+        function onDisableTabBar(disabled) {
+            isControlsDisabled = disabled
+        }
+
         function onEscapePressed() {
             if (isControlsDisabled) {
                 return
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index ee4001a0..696741dd 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -15,6 +15,7 @@ PageType {
     id: root
 
     property bool isControlsDisabled: false
+    property bool isTabBarDisabled: false
 
     Connections {
         target: PageController
@@ -38,6 +39,10 @@ PageType {
             isControlsDisabled = disabled
         }
 
+        function onDisableTabBar(disabled) {
+            isTabBarDisabled = disabled
+        }
+
         function onClosePage() {
             if (tabBarStackView.depth <= 1) {
                 return
@@ -63,7 +68,7 @@ PageType {
         }
 
         function onEscapePressed() {
-            if (root.isControlsDisabled) {
+            if (root.isControlsDisabled || root.isTabBarDisabled) {
                 return
             }
 
@@ -179,7 +184,7 @@ PageType {
         leftPadding: 96
         rightPadding: 96
 
-        enabled: !root.isControlsDisabled
+        enabled: !root.isControlsDisabled && !root.isTabBarDisabled
 
         background: Shape {
             width: parent.width