diff --git a/src/plugins/git/branchadddialog.cpp b/src/plugins/git/branchadddialog.cpp
index edc50889ec0..ccb2b37633a 100644
--- a/src/plugins/git/branchadddialog.cpp
+++ b/src/plugins/git/branchadddialog.cpp
@@ -110,6 +110,7 @@ BranchAddDialog::BranchAddDialog(const QStringList &localBranches, bool addBranc
     m_ui(new Ui::BranchAddDialog)
 {
     m_ui->setupUi(this);
+    m_ui->trackingCheckBox->setVisible(false);
     setCheckoutVisible(false);
     setWindowTitle(addBranch ? tr("Add Branch") : tr("Rename Branch"));
     m_ui->branchNameEdit->setValidator(new BranchNameValidator(localBranches, this));
@@ -134,14 +135,14 @@ QString BranchAddDialog::branchName() const
 
 void BranchAddDialog::setTrackedBranchName(const QString &name, bool remote)
 {
-    m_ui->trackingCheckBox->setVisible(true);
-    if (!name.isEmpty()) {
-        m_ui->trackingCheckBox->setText(remote ? tr("Track remote branch \'%1\'").arg(name) :
-                                                 tr("Track local branch \'%1\'").arg(name));
-        m_ui->trackingCheckBox->setChecked(remote);
-    } else {
+    if (name.isEmpty()) {
         m_ui->trackingCheckBox->setVisible(false);
         m_ui->trackingCheckBox->setChecked(false);
+    } else {
+        m_ui->trackingCheckBox->setText(remote ? tr("Track remote branch \"%1\"").arg(name) :
+                                                 tr("Track local branch \"%1\"").arg(name));
+        m_ui->trackingCheckBox->setVisible(true);
+        m_ui->trackingCheckBox->setChecked(remote);
     }
 }
 
diff --git a/src/plugins/git/branchadddialog.ui b/src/plugins/git/branchadddialog.ui
index 4ee0b5d7873..41f9fc5caf7 100644
--- a/src/plugins/git/branchadddialog.ui
+++ b/src/plugins/git/branchadddialog.ui
@@ -32,11 +32,7 @@
     </widget>
    </item>
    <item row="2" column="0" colspan="2">
-    <widget class="QCheckBox" name="trackingCheckBox">
-     <property name="text">
-      <string>CheckBox</string>
-     </property>
-    </widget>
+    <widget class="QCheckBox" name="trackingCheckBox"/>
    </item>
    <item row="4" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="buttonBox">