diff --git a/src/config/clangtidypreferences.cpp b/src/config/clangtidypreferences.cpp
index 8bb495b2ae..9e35ee3221 100644
--- a/src/config/clangtidypreferences.cpp
+++ b/src/config/clangtidypreferences.cpp
@@ -1,72 +1,69 @@
 /*
  * This file is part of KDevelop
  *
  * Copyright 2016 Carlos Nihelton <carlosnsoliveira@gmail.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
  */
 
 #include "config/clangtidypreferences.h"
 #include "clangtidyconfig.h"
 #include "config/configgroup.h"
 #include "ui_clangtidypreferences.h"
 
 #include <QVBoxLayout>
 
 using KDevelop::IPlugin;
 using ClangTidy::ConfigGroup;
 using KDevelop::ConfigPage;
 
 ClangTidyPreferences::ClangTidyPreferences(IPlugin* plugin, QWidget* parent)
     : ConfigPage(plugin, ClangTidySettings::self(), parent)
 {
-    QVBoxLayout* layout = new QVBoxLayout(this);
-    QWidget* widget = new QWidget(this);
     ui = new Ui::ClangTidyPreferences();
-    ui->setupUi(widget);
-    layout->addWidget(widget);
+    ui->setupUi(this);
 }
 
 ClangTidyPreferences::~ClangTidyPreferences()
 {
     delete ui;
 }
 
 ConfigPage::ConfigPageType ClangTidyPreferences::configPageType() const
 {
     return ConfigPage::AnalyzerConfigPage;
 }
 
 QString ClangTidyPreferences::name() const
 {
     return i18n("Clang-Tidy");
 }
 
 QString ClangTidyPreferences::fullName() const
 {
     return i18n("Configure clang-tidy settings");
 }
 
 QIcon ClangTidyPreferences::icon() const
 {
     return QIcon::fromTheme(QStringLiteral("dialog-ok"));
 }
 
 void ClangTidyPreferences::apply()
 {
     ConfigGroup configGroup = KSharedConfig::openConfig()->group("ClangTidy");
     configGroup.writeEntry(ConfigGroup::ExecutablePath, ui->kcfg_clangtidyPath->text());
 }
diff --git a/src/config/clangtidypreferences.ui b/src/config/clangtidypreferences.ui
index 4500a31ca3..cec7712c1a 100644
--- a/src/config/clangtidypreferences.ui
+++ b/src/config/clangtidypreferences.ui
@@ -1,75 +1,87 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ClangTidyPreferences</class>
  <widget class="QWidget" name="ClangTidyPreferences">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>400</width>
     <height>300</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Clang-Tidy Settings</string>
   </property>
-  <layout class="QVBoxLayout" name="settingsLayout">
+  <layout class="QVBoxLayout" name="settingsLayout" stretch="0,0">
+   <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>
     <widget class="QGroupBox" name="pathsGroupBox">
      <property name="title">
       <string>Paths</string>
      </property>
      <layout class="QHBoxLayout" name="pathsGroupBoxLayout">
       <item>
        <layout class="QVBoxLayout" name="pathsLabelsLayout">
         <item>
          <widget class="QLabel" name="clangtidyLabel">
           <property name="text">
            <string>Clang-&amp;tidy executable:</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
           <property name="buddy">
            <cstring>kcfg_clangtidyPath</cstring>
           </property>
          </widget>
         </item>
        </layout>
       </item>
       <item>
        <layout class="QVBoxLayout" name="pathsUrlsLayout">
         <item>
          <widget class="KUrlRequester" name="kcfg_clangtidyPath"/>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer name="settingsSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>186</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QFrame</extends>
    <header>kurlrequester.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>