diff --git a/src/plugins/git/CMakeLists.txt b/src/plugins/git/CMakeLists.txt
index b6f94c7174f..6cbb771bc1b 100644
--- a/src/plugins/git/CMakeLists.txt
+++ b/src/plugins/git/CMakeLists.txt
@@ -6,7 +6,7 @@ add_qtc_plugin(Git
     branchcheckoutdialog.cpp branchcheckoutdialog.h
     branchmodel.cpp branchmodel.h
     branchview.cpp branchview.h
-    changeselectiondialog.cpp changeselectiondialog.h changeselectiondialog.ui
+    changeselectiondialog.cpp changeselectiondialog.h
     commitdata.cpp commitdata.h
     gerrit/authenticationdialog.cpp gerrit/authenticationdialog.h
     gerrit/branchcombobox.cpp gerrit/branchcombobox.h
diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp
index 91fbe6af3ac..c7cdec38b7e 100644
--- a/src/plugins/git/changeselectiondialog.cpp
+++ b/src/plugins/git/changeselectiondialog.cpp
@@ -24,18 +24,21 @@
 ****************************************************************************/
 
 #include "changeselectiondialog.h"
+
 #include "logchangedialog.h"
 #include "gitclient.h"
-#include "ui_changeselectiondialog.h"
 
 #include <coreplugin/vcsmanager.h>
 
+#include <utils/completinglineedit.h>
+#include <utils/layoutbuilder.h>
 #include <utils/pathchooser.h>
 #include <utils/qtcprocess.h>
 #include <utils/theme/theme.h>
 
 #include <vcsbase/vcscommand.h>
 
+#include <QApplication>
 #include <QCompleter>
 #include <QDir>
 #include <QFileDialog>
@@ -56,63 +59,97 @@ namespace Internal {
 
 ChangeSelectionDialog::ChangeSelectionDialog(const FilePath &workingDirectory, Id id,
                                              QWidget *parent) :
-    QDialog(parent), m_ui(new Ui::ChangeSelectionDialog)
+    QDialog(parent)
 {
     m_gitExecutable = GitClient::instance()->vcsBinary();
-    m_ui->setupUi(this);
-    m_ui->workingDirectoryChooser->setExpectedKind(PathChooser::ExistingDirectory);
-    m_ui->workingDirectoryChooser->setPromptDialogTitle(tr("Select Git Directory"));
-    m_ui->workingDirectoryChooser->setFilePath(workingDirectory);
     m_gitEnvironment = GitClient::instance()->processEnvironment();
-    m_ui->changeNumberEdit->setFocus();
-    m_ui->changeNumberEdit->selectAll();
 
-    connect(m_ui->changeNumberEdit, &CompletingLineEdit::textChanged,
+    resize(550, 350);
+    setWindowTitle(tr("Select a Git Commit"));
+
+    m_workingDirectoryChooser = new PathChooser(this);
+
+    m_changeNumberEdit = new CompletingLineEdit(this);
+    m_changeNumberEdit->setText(tr("HEAD"));
+    m_changeNumberEdit->setFocus();
+    m_changeNumberEdit->selectAll();
+
+    m_detailsText = new QPlainTextEdit(this);
+    m_detailsText->setUndoRedoEnabled(false);
+    m_detailsText->setLineWrapMode(QPlainTextEdit::NoWrap);
+    m_detailsText->setReadOnly(true);
+
+    auto selectFromHistoryButton = new QPushButton(tr("Browse &History..."));
+    auto closeButton = new QPushButton(tr("&Close"));
+    auto archiveButton = new QPushButton(tr("&Archive..."));
+
+    m_checkoutButton = new QPushButton(tr("Check&out"));
+    m_revertButton = new QPushButton(tr("&Revert"));
+    m_cherryPickButton = new QPushButton(tr("Cherry &Pick"));
+    m_showButton = new QPushButton(tr("&Show"));
+
+    m_workingDirectoryChooser->setExpectedKind(PathChooser::ExistingDirectory);
+    m_workingDirectoryChooser->setPromptDialogTitle(tr("Select Git Directory"));
+    m_workingDirectoryChooser->setFilePath(workingDirectory);
+
+    using namespace Layouting;
+    Column {
+        Grid {
+            tr("Working directory:"), m_workingDirectoryChooser, br,
+            tr("Change:"), m_changeNumberEdit, selectFromHistoryButton,
+        },
+        m_detailsText,
+        Row {
+            closeButton, st, archiveButton, m_checkoutButton,
+            m_revertButton, m_cherryPickButton, m_showButton
+        }
+    }.attachTo(this);
+
+    connect(m_changeNumberEdit, &CompletingLineEdit::textChanged,
             this, &ChangeSelectionDialog::changeTextChanged);
-    connect(m_ui->workingDirectoryChooser, &PathChooser::filePathChanged,
+    connect(m_workingDirectoryChooser, &PathChooser::filePathChanged,
             this, &ChangeSelectionDialog::recalculateDetails);
-    connect(m_ui->workingDirectoryChooser, &PathChooser::filePathChanged,
+    connect(m_workingDirectoryChooser, &PathChooser::filePathChanged,
             this, &ChangeSelectionDialog::recalculateCompletion);
-    connect(m_ui->selectFromHistoryButton, &QPushButton::clicked,
+    connect(selectFromHistoryButton, &QPushButton::clicked,
             this, &ChangeSelectionDialog::selectCommitFromRecentHistory);
-    connect(m_ui->showButton, &QPushButton::clicked,
+    connect(m_showButton, &QPushButton::clicked,
             this, std::bind(&ChangeSelectionDialog::acceptCommand, this, Show));
-    connect(m_ui->cherryPickButton, &QPushButton::clicked,
+    connect(m_cherryPickButton, &QPushButton::clicked,
             this, std::bind(&ChangeSelectionDialog::acceptCommand, this, CherryPick));
-    connect(m_ui->revertButton, &QPushButton::clicked,
+    connect(m_revertButton, &QPushButton::clicked,
             this, std::bind(&ChangeSelectionDialog::acceptCommand, this, Revert));
-    connect(m_ui->checkoutButton, &QPushButton::clicked,
+    connect(m_checkoutButton, &QPushButton::clicked,
             this, std::bind(&ChangeSelectionDialog::acceptCommand, this, Checkout));
-    connect(m_ui->archiveButton, &QPushButton::clicked,
+    connect(archiveButton, &QPushButton::clicked,
             this, std::bind(&ChangeSelectionDialog::acceptCommand, this, Archive));
 
     if (id == "Git.Revert")
-        m_ui->revertButton->setDefault(true);
+        m_revertButton->setDefault(true);
     else if (id == "Git.CherryPick")
-        m_ui->cherryPickButton->setDefault(true);
+        m_cherryPickButton->setDefault(true);
     else if (id == "Git.Checkout")
-        m_ui->checkoutButton->setDefault(true);
+        m_checkoutButton->setDefault(true);
     else if (id == "Git.Archive")
-        m_ui->archiveButton->setDefault(true);
+        archiveButton->setDefault(true);
     else
-        m_ui->showButton->setDefault(true);
+        m_showButton->setDefault(true);
     m_changeModel = new QStringListModel(this);
     auto changeCompleter = new QCompleter(m_changeModel, this);
-    m_ui->changeNumberEdit->setCompleter(changeCompleter);
+    m_changeNumberEdit->setCompleter(changeCompleter);
     changeCompleter->setCaseSensitivity(Qt::CaseInsensitive);
 
     recalculateDetails();
     recalculateCompletion();
+
+    connect(closeButton, &QPushButton::clicked, this, &QDialog::reject);
 }
 
-ChangeSelectionDialog::~ChangeSelectionDialog()
-{
-    delete m_ui;
-}
+ChangeSelectionDialog::~ChangeSelectionDialog() = default;
 
 QString ChangeSelectionDialog::change() const
 {
-    return m_ui->changeNumberEdit->text().trimmed();
+    return m_changeNumberEdit->text().trimmed();
 }
 
 void ChangeSelectionDialog::selectCommitFromRecentHistory()
@@ -133,12 +170,12 @@ void ChangeSelectionDialog::selectCommitFromRecentHistory()
     if (dialog.result() == QDialog::Rejected || dialog.commitIndex() == -1)
         return;
 
-    m_ui->changeNumberEdit->setText(dialog.commit());
+    m_changeNumberEdit->setText(dialog.commit());
 }
 
 FilePath ChangeSelectionDialog::workingDirectory() const
 {
-    const FilePath workingDir = m_ui->workingDirectoryChooser->filePath();
+    const FilePath workingDir = m_workingDirectoryChooser->filePath();
     if (workingDir.isEmpty() || !workingDir.exists())
         return {};
 
@@ -163,25 +200,25 @@ void ChangeSelectionDialog::setDetails()
 
     QPalette palette;
     if (m_process->result() == ProcessResult::FinishedWithSuccess) {
-        m_ui->detailsText->setPlainText(m_process->cleanedStdOut());
+        m_detailsText->setPlainText(m_process->cleanedStdOut());
         palette.setColor(QPalette::Text, theme->color(Theme::TextColorNormal));
-        m_ui->changeNumberEdit->setPalette(palette);
+        m_changeNumberEdit->setPalette(palette);
     } else if (m_process->result() == ProcessResult::StartFailed) {
-        m_ui->detailsText->setPlainText(tr("Error: Could not start Git."));
+        m_detailsText->setPlainText(tr("Error: Could not start Git."));
     } else {
-        m_ui->detailsText->setPlainText(tr("Error: Unknown reference"));
+        m_detailsText->setPlainText(tr("Error: Unknown reference"));
         palette.setColor(QPalette::Text, theme->color(Theme::TextColorError));
-        m_ui->changeNumberEdit->setPalette(palette);
+        m_changeNumberEdit->setPalette(palette);
         enableButtons(false);
     }
 }
 
 void ChangeSelectionDialog::enableButtons(bool b)
 {
-    m_ui->showButton->setEnabled(b);
-    m_ui->cherryPickButton->setEnabled(b);
-    m_ui->revertButton->setEnabled(b);
-    m_ui->checkoutButton->setEnabled(b);
+    m_showButton->setEnabled(b);
+    m_cherryPickButton->setEnabled(b);
+    m_revertButton->setEnabled(b);
+    m_checkoutButton->setEnabled(b);
 }
 
 void ChangeSelectionDialog::recalculateCompletion()
@@ -209,13 +246,13 @@ void ChangeSelectionDialog::recalculateDetails()
 
     const FilePath workingDir = workingDirectory();
     if (workingDir.isEmpty()) {
-        m_ui->detailsText->setPlainText(tr("Error: Bad working directory."));
+        m_detailsText->setPlainText(tr("Error: Bad working directory."));
         return;
     }
 
     const QString ref = change();
     if (ref.isEmpty()) {
-        m_ui->detailsText->clear();
+        m_detailsText->clear();
         return;
     }
 
@@ -225,12 +262,12 @@ void ChangeSelectionDialog::recalculateDetails()
     m_process->setEnvironment(m_gitEnvironment);
     m_process->setCommand({m_gitExecutable, {"show", "--decorate", "--stat=80", ref}});
     m_process->start();
-    m_ui->detailsText->setPlainText(tr("Fetching commit data..."));
+    m_detailsText->setPlainText(tr("Fetching commit data..."));
 }
 
 void ChangeSelectionDialog::changeTextChanged(const QString &text)
 {
-    if (QCompleter *comp = m_ui->changeNumberEdit->completer()) {
+    if (QCompleter *comp = m_changeNumberEdit->completer()) {
         if (text.isEmpty() && !comp->popup()->isVisible()) {
             comp->setCompletionPrefix(text);
             QTimer::singleShot(0, comp, [comp]{ comp->complete(); });
diff --git a/src/plugins/git/changeselectiondialog.h b/src/plugins/git/changeselectiondialog.h
index d4bb7dc607f..e373be0d62c 100644
--- a/src/plugins/git/changeselectiondialog.h
+++ b/src/plugins/git/changeselectiondialog.h
@@ -26,16 +26,22 @@
 #pragma once
 
 #include <utils/environment.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 #include <utils/id.h>
 
 #include <QDialog>
 
 QT_BEGIN_NAMESPACE
+class QPlainTextEdit;
+class QPushButton;
 class QStringListModel;
 QT_END_NAMESPACE
 
-namespace Utils { class QtcProcess; }
+namespace Utils {
+class CompletingLineEdit;
+class PathChooser;
+class QtcProcess;
+} // Utils
 
 namespace Git {
 namespace Internal {
@@ -49,8 +55,6 @@ enum ChangeCommand {
     Show
 };
 
-namespace Ui { class ChangeSelectionDialog; }
-
 class ChangeSelectionDialog : public QDialog
 {
     Q_OBJECT
@@ -73,14 +77,20 @@ private:
 
     void enableButtons(bool b);
 
-    Ui::ChangeSelectionDialog *m_ui;
-
     std::unique_ptr<Utils::QtcProcess> m_process;
     Utils::FilePath m_gitExecutable;
     Utils::Environment m_gitEnvironment;
     ChangeCommand m_command = NoCommand;
     QStringListModel *m_changeModel = nullptr;
     Utils::FilePath m_oldWorkingDir;
+
+    Utils::PathChooser *m_workingDirectoryChooser;
+    Utils::CompletingLineEdit *m_changeNumberEdit;
+    QPlainTextEdit *m_detailsText;
+    QPushButton *m_checkoutButton;
+    QPushButton *m_revertButton;
+    QPushButton *m_cherryPickButton;
+    QPushButton *m_showButton;
 };
 
 } // namespace Internal
diff --git a/src/plugins/git/changeselectiondialog.ui b/src/plugins/git/changeselectiondialog.ui
deleted file mode 100644
index b6db63a45a1..00000000000
--- a/src/plugins/git/changeselectiondialog.ui
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Git::Internal::ChangeSelectionDialog</class>
- <widget class="QDialog" name="Git::Internal::ChangeSelectionDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>550</width>
-    <height>350</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Select a Git Commit</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <property name="sizeConstraint">
-    <enum>QLayout::SetDefaultConstraint</enum>
-   </property>
-   <item row="0" column="0">
-    <widget class="QLabel" name="workingDirectoryLabel">
-     <property name="text">
-      <string>Working directory:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1" colspan="2">
-    <widget class="Utils::PathChooser" name="workingDirectoryChooser" native="true"/>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="changeLabel">
-     <property name="text">
-      <string>Change:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="Utils::CompletingLineEdit" name="changeNumberEdit">
-     <property name="text">
-      <string>HEAD</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="2">
-    <widget class="QPushButton" name="selectFromHistoryButton">
-     <property name="text">
-      <string>Browse &amp;History...</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" colspan="3">
-    <widget class="QPlainTextEdit" name="detailsText">
-     <property name="undoRedoEnabled">
-      <bool>false</bool>
-     </property>
-     <property name="lineWrapMode">
-      <enum>QPlainTextEdit::NoWrap</enum>
-     </property>
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="3">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QPushButton" name="closeButton">
-       <property name="text">
-        <string>&amp;Close</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="archiveButton">
-       <property name="text">
-        <string>&amp;Archive...</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="checkoutButton">
-       <property name="text">
-        <string>Check&amp;out</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="revertButton">
-       <property name="text">
-        <string>&amp;Revert</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="cherryPickButton">
-       <property name="text">
-        <string>Cherry &amp;Pick</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="showButton">
-       <property name="text">
-        <string>&amp;Show</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>Utils::CompletingLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header location="global">utils/completinglineedit.h</header>
-  </customwidget>
-  <customwidget>
-   <class>Utils::PathChooser</class>
-   <extends>QWidget</extends>
-   <header location="global">utils/pathchooser.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections>
-  <connection>
-   <sender>closeButton</sender>
-   <signal>clicked()</signal>
-   <receiver>Git::Internal::ChangeSelectionDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>52</x>
-     <y>324</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>112</x>
-     <y>312</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/src/plugins/git/git.qbs b/src/plugins/git/git.qbs
index e54b9e465b4..a86b4acda67 100644
--- a/src/plugins/git/git.qbs
+++ b/src/plugins/git/git.qbs
@@ -26,7 +26,6 @@ QtcPlugin {
         "branchview.h",
         "changeselectiondialog.cpp",
         "changeselectiondialog.h",
-        "changeselectiondialog.ui",
         "commitdata.cpp",
         "commitdata.h",
         "git.qrc",