diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp
index 605646a4176..49ea2264b0d 100644
--- a/src/plugins/android/androidsettingswidget.cpp
+++ b/src/plugins/android/androidsettingswidget.cpp
@@ -350,13 +350,18 @@ AndroidSettingsWidget::AndroidSettingsWidget()
     sdkMangerLayout->setContentsMargins(0, 0, 0, 0);
     sdkMangerLayout->addWidget(m_sdkManagerWidget);
     connect(m_sdkManagerWidget, &AndroidSdkManagerWidget::updatingSdk, [this] {
-        m_ui.SDKLocationPathChooser->setEnabled(false);
-        // Disable the tab bar to restrict the user moving away from sdk manager tab untill
-        // operations finish.
+        // Disable the top level UI to keep the user from unintentionally interrupting operations
+        m_ui.javaSettingsGroupBox->setEnabled(false);
+        m_ui.androidSettingsGroupBox->setEnabled(false);
+        m_ui.androidOpenSSLSettingsGroupBox->setEnabled(false);
+        m_ui.CreateKitCheckBox->setEnabled(false);
         m_ui.managerTabWidget->tabBar()->setEnabled(false);
     });
     connect(m_sdkManagerWidget, &AndroidSdkManagerWidget::updatingSdkFinished, [this] {
-        m_ui.SDKLocationPathChooser->setEnabled(true);
+        m_ui.javaSettingsGroupBox->setEnabled(true);
+        m_ui.androidSettingsGroupBox->setEnabled(true);
+        m_ui.androidOpenSSLSettingsGroupBox->setEnabled(true);
+        m_ui.CreateKitCheckBox->setEnabled(true);
         m_ui.managerTabWidget->tabBar()->setEnabled(true);
     });
     connect(m_sdkManagerWidget, &AndroidSdkManagerWidget::licenseWorkflowStarted, [this] {
diff --git a/src/plugins/android/androidsettingswidget.ui b/src/plugins/android/androidsettingswidget.ui
index 764a41d1e06..2e67a645e72 100644
--- a/src/plugins/android/androidsettingswidget.ui
+++ b/src/plugins/android/androidsettingswidget.ui
@@ -66,7 +66,7 @@
         <number>0</number>
        </property>
        <item>
-        <widget class="QGroupBox" name="javaSettingsGroup">
+        <widget class="QGroupBox" name="javaSettingsGroupBox">
          <property name="minimumSize">
           <size>
            <width>0</width>
@@ -124,7 +124,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox">
+        <widget class="QGroupBox" name="androidSettingsGroupBox">
          <property name="title">
           <string>Android Settings</string>
          </property>
@@ -263,7 +263,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox_2">
+        <widget class="QGroupBox" name="androidOpenSSLSettingsGroupBox">
          <property name="title">
           <string>Android OpenSSL settings (Optional)</string>
          </property>