diff --git a/src/plugins/projectexplorer/targetsettingswidget.cpp b/src/plugins/projectexplorer/targetsettingswidget.cpp
index 4dc7de6b5d6..e4c1cc76c2a 100644
--- a/src/plugins/projectexplorer/targetsettingswidget.cpp
+++ b/src/plugins/projectexplorer/targetsettingswidget.cpp
@@ -139,7 +139,10 @@ QString TargetSettingsWidget::targetNameAt(int index) const
 
 void TargetSettingsWidget::setCentralWidget(QWidget *widget)
 {
-    ui->scrollArea->setWidget(widget);
+    if (m_centralWidget)
+        ui->scrollAreaWidgetContents->layout()->removeWidget(m_centralWidget);
+    m_centralWidget = widget;
+    ui->scrollAreaWidgetContents->layout()->addWidget(m_centralWidget);
 }
 
 int TargetSettingsWidget::targetCount() const
diff --git a/src/plugins/projectexplorer/targetsettingswidget.h b/src/plugins/projectexplorer/targetsettingswidget.h
index 1e8bdbf0ad5..36d4265cf39 100644
--- a/src/plugins/projectexplorer/targetsettingswidget.h
+++ b/src/plugins/projectexplorer/targetsettingswidget.h
@@ -83,6 +83,7 @@ private:
     TargetSelector *m_targetSelector;
     QPushButton *m_addButton;
     QPushButton *m_manageButton;
+    QWidget *m_centralWidget = 0;
 };
 
 } // namespace Internal
diff --git a/src/plugins/projectexplorer/targetsettingswidget.ui b/src/plugins/projectexplorer/targetsettingswidget.ui
index 028e3d647d7..d515dd9da9b 100644
--- a/src/plugins/projectexplorer/targetsettingswidget.ui
+++ b/src/plugins/projectexplorer/targetsettingswidget.ui
@@ -17,7 +17,16 @@
    <property name="spacing">
     <number>0</number>
    </property>
-   <property name="margin">
+   <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>
@@ -30,7 +39,7 @@
      </property>
     </widget>
    </item>
-   <item>
+      <item>
     <widget class="QWidget" name="separator" native="true">
      <property name="minimumSize">
       <size>
@@ -130,23 +139,24 @@
     </widget>
    </item>
    <item>
-    <widget class="QScrollArea" name="scrollArea">
-     <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
-     </property>
-     <property name="widgetResizable">
-      <bool>true</bool>
-     </property>
-     <widget class="QWidget" name="scrollAreaWidgetContents">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>618</width>
-        <height>424</height>
-       </rect>
+    <widget class="QWidget" name="scrollAreaWidgetContents" native="true">
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <property name="spacing">
+       <number>0</number>
       </property>
-     </widget>
+      <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>
+     </layout>
     </widget>
    </item>
   </layout>