diff --git a/src/plugins/android/androidsdkmanagerwidget.ui b/src/plugins/android/androidsdkmanagerwidget.ui
index 695965251c4..ea35571896e 100644
--- a/src/plugins/android/androidsdkmanagerwidget.ui
+++ b/src/plugins/android/androidsdkmanagerwidget.ui
@@ -48,10 +48,7 @@
        <property name="bottomMargin">
         <number>0</number>
        </property>
-       <property name="spacing">
-        <number>4</number>
-       </property>
-       <item row="2" column="0" colspan="4">
+       <item row="1" column="0" colspan="2">
         <widget class="QTreeView" name="packagesView">
          <property name="indentation">
           <number>20</number>
@@ -61,7 +58,7 @@
          </attribute>
         </widget>
        </item>
-       <item row="2" column="4">
+       <item row="1" column="2">
         <layout class="QVBoxLayout" name="verticalLayout_2">
          <item>
           <widget class="QPushButton" name="updateInstalledButton">
@@ -195,10 +192,10 @@
          </item>
         </layout>
        </item>
-       <item row="1" column="1">
+       <item row="0" column="0">
         <widget class="Utils::FancyLineEdit" name="searchField"/>
        </item>
-       <item row="1" column="2">
+       <item row="0" column="1">
         <widget class="QCheckBox" name="expandCheck">
          <property name="text">
           <string>Expand All</string>
@@ -209,6 +206,18 @@
      </widget>
      <widget class="QWidget" name="outputStack">
       <layout class="QGridLayout" name="gridLayout_2">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
        <item row="3" column="2">
         <widget class="QPushButton" name="cancelButton">
          <property name="text">
diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp
index a7e6973ab1d..7f71ee88a54 100644
--- a/src/plugins/android/androidsettingswidget.cpp
+++ b/src/plugins/android/androidsettingswidget.cpp
@@ -291,16 +291,14 @@ AndroidSettingsWidget::AndroidSettingsWidget()
 {
     m_ui.setupUi(this);
     m_sdkManagerWidget = new AndroidSdkManagerWidget(m_androidConfig, &m_sdkManager,
-                                                     m_ui.sdkManagerTab);
-    auto sdkMangerLayout = new QVBoxLayout(m_ui.sdkManagerTab);
-    sdkMangerLayout->setContentsMargins(0, 0, 0, 0);
+                                                     m_ui.sdkManagerGroupBox);
+    auto sdkMangerLayout = new QVBoxLayout(m_ui.sdkManagerGroupBox);
     sdkMangerLayout->addWidget(m_sdkManagerWidget);
     connect(m_sdkManagerWidget, &AndroidSdkManagerWidget::updatingSdk, [this] {
         // Disable the top level UI to keep the user from unintentionally interrupting operations
         m_ui.androidSettingsGroupBox->setEnabled(false);
         m_ui.androidOpenSSLSettingsGroupBox->setEnabled(false);
         m_ui.CreateKitCheckBox->setEnabled(false);
-        m_ui.managerTabWidget->tabBar()->setEnabled(false);
         m_androidSummary->setState(DetailsWidget::Collapsed);
         m_androidProgress->hide();
     });
@@ -308,13 +306,12 @@ AndroidSettingsWidget::AndroidSettingsWidget()
         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] {
         QObject *parentWidget = parent();
         while (parentWidget) {
             if (auto scrollArea = qobject_cast<QScrollArea *>(parentWidget)) {
-                scrollArea->ensureWidgetVisible(m_ui.managerTabWidget);
+                scrollArea->ensureWidgetVisible(m_ui.sdkManagerGroupBox);
                 break;
             }
             parentWidget = parentWidget->parent();
@@ -530,7 +527,6 @@ void AndroidSettingsWidget::validateSdk()
         auto userInput = QMessageBox::information(this, tr("Missing Android SDK Packages"),
                                                   message, QMessageBox::Yes | QMessageBox::No);
         if (userInput == QMessageBox::Yes) {
-            m_ui.managerTabWidget->setCurrentWidget(m_ui.sdkManagerTab);
             m_sdkManagerWidget->installEssentials();
         }
     }
@@ -651,7 +647,7 @@ void AndroidSettingsWidget::updateUI()
     const bool androidSetupOk = m_androidSummary->allRowsOk();
     const bool openSslOk = m_openSslSummary->allRowsOk();
 
-    m_ui.sdkManagerTab->setEnabled(sdkToolsOk);
+    m_ui.sdkManagerGroupBox->setEnabled(sdkToolsOk);
 
     const QListWidgetItem *currentItem = m_ui.ndkListWidget->currentItem();
     const FilePath currentNdk = FilePath::fromString(currentItem ? currentItem->text() : "");
diff --git a/src/plugins/android/androidsettingswidget.ui b/src/plugins/android/androidsettingswidget.ui
index eadb1c2c8cc..0e021f52420 100644
--- a/src/plugins/android/androidsettingswidget.ui
+++ b/src/plugins/android/androidsettingswidget.ui
@@ -175,6 +175,16 @@
         </property>
        </widget>
       </item>
+      <item row="7" column="0" colspan="7">
+       <widget class="QCheckBox" name="CreateKitCheckBox">
+        <property name="text">
+         <string>Automatically create kits for Android tool chains</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -224,31 +234,10 @@
     </widget>
    </item>
    <item>
-    <widget class="QCheckBox" name="CreateKitCheckBox">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+    <widget class="QGroupBox" name="sdkManagerGroupBox">
+     <property name="title">
+      <string>SDK Manager</string>
      </property>
-     <property name="text">
-      <string>Automatically create kits for Android tool chains</string>
-     </property>
-     <property name="checked">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QTabWidget" name="managerTabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="sdkManagerTab">
-      <attribute name="title">
-       <string>SDK Manager</string>
-      </attribute>
-     </widget>
     </widget>
    </item>
   </layout>