diff --git a/languages/plugins/custom-definesandincludes/compilerprovider/widget/compilerswidget.h b/languages/plugins/custom-definesandincludes/compilerprovider/widget/compilerswidget.h
--- a/languages/plugins/custom-definesandincludes/compilerprovider/widget/compilerswidget.h
+++ b/languages/plugins/custom-definesandincludes/compilerprovider/widget/compilerswidget.h
@@ -68,7 +68,6 @@
     void addCompiler(const QString& factoryName);
     void compilerSelected(const QModelIndex& index);
     void compilerEdited();
-    void selectCompilerPathDialog();
 
 signals:
     void compilerChanged();
diff --git a/languages/plugins/custom-definesandincludes/compilerprovider/widget/compilerswidget.cpp b/languages/plugins/custom-definesandincludes/compilerprovider/widget/compilerswidget.cpp
--- a/languages/plugins/custom-definesandincludes/compilerprovider/widget/compilerswidget.cpp
+++ b/languages/plugins/custom-definesandincludes/compilerprovider/widget/compilerswidget.cpp
@@ -25,7 +25,6 @@
 
 #include <QAction>
 #include <KLocalizedString>
-#include <QFileDialog>
 #include <QKeySequence>
 #include <QMenu>
 #include <QSignalMapper>
@@ -49,6 +48,7 @@
 
     m_ui->addButton->setIcon(QIcon::fromTheme(QStringLiteral("list-add")));
     m_ui->removeButton->setIcon(QIcon::fromTheme(QStringLiteral("list-remove")));
+    m_ui->compilerPath->setWindowTitle(i18n("Select Compiler Executable"));
 
     m_addMenu = new QMenu(m_ui->addButton);
     m_mapper = new QSignalMapper(m_addMenu);
@@ -78,10 +78,8 @@
 
     connect(m_ui->compilers->selectionModel(), &QItemSelectionModel::currentChanged, this, &CompilersWidget::compilerSelected);
 
-    connect(m_ui->compilerName, &QLineEdit::editingFinished, this, &CompilersWidget::compilerEdited);
-    connect(m_ui->compilerPath, &QLineEdit::editingFinished, this, &CompilersWidget::compilerEdited);
-
-    connect(m_ui->compilerSelector, &QPushButton::clicked, this, &CompilersWidget::selectCompilerPathDialog);
+    connect(m_ui->compilerName, &QLineEdit::textEdited, this, &CompilersWidget::compilerEdited);
+    connect(m_ui->compilerPath, &KUrlRequester::textEdited, this, &CompilersWidget::compilerEdited);
 
     connect(m_compilersModel, &CompilersModel::compilerChanged, this, &CompilersWidget::compilerChanged);
 
@@ -95,6 +93,7 @@
 void CompilersWidget::setCompilers(const QVector< CompilerPointer >& compilers)
 {
     m_compilersModel->setCompilers(compilers);
+    m_ui->compilers->expandAll();
 }
 
 void CompilersWidget::clear()
@@ -132,6 +131,8 @@
 
             m_ui->compilers->selectionModel()->select(compilerIndex, QItemSelectionModel::Clear | QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
             compilerSelected(compilerIndex);
+            m_ui->compilers->scrollTo(compilerIndex);
+            m_ui->compilerName->setFocus(Qt::OtherFocusReason);
             break;
         }
     }
@@ -174,21 +175,10 @@
     emit changed();
 }
 
-void CompilersWidget::selectCompilerPathDialog()
-{
-    const QString compilerPath = QFileDialog::getOpenFileName(this, tr("Select path to compiler"));
-    if (compilerPath.isEmpty())
-        return;
-
-    m_ui->compilerPath->setText(compilerPath);
-    compilerEdited();
-}
-
 void CompilersWidget::enableItems(bool enable)
 {
     m_ui->compilerName->setEnabled(enable);
     m_ui->compilerPath->setEnabled(enable);
-    m_ui->compilerSelector->setEnabled(enable);
 
     if(!enable) {
         m_ui->compilerName->clear();
diff --git a/languages/plugins/custom-definesandincludes/compilerprovider/widget/compilerswidget.ui b/languages/plugins/custom-definesandincludes/compilerprovider/widget/compilerswidget.ui
--- a/languages/plugins/custom-definesandincludes/compilerprovider/widget/compilerswidget.ui
+++ b/languages/plugins/custom-definesandincludes/compilerprovider/widget/compilerswidget.ui
@@ -67,35 +67,25 @@
       <item row="1" column="0">
        <widget class="QLabel" name="label_2">
         <property name="text">
-         <string>Compiler path:</string>
+         <string>Compiler executable:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="QLineEdit" name="compilerPath"/>
-        </item>
-        <item>
-         <widget class="QPushButton" name="compilerSelector">
-          <property name="maximumSize">
-           <size>
-            <width>30</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>...</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
+       <widget class="KUrlRequester" name="compilerPath"/>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>KUrlRequester</class>
+   <extends>QWidget</extends>
+   <header>kurlrequester.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>