diff --git a/src/ViewModels/Push.cs b/src/ViewModels/Push.cs
index ad794fbd..2da3895b 100644
--- a/src/ViewModels/Push.cs
+++ b/src/ViewModels/Push.cs
@@ -58,7 +58,7 @@ namespace SourceGit.ViewModels
             set
             {
                 if (SetProperty(ref _selectedRemoteBranch, value, true))
-                    IsSetTrackOptionVisible = value != null && _selectedLocalBranch.Upstream != value.FullName;
+                    IsSetTrackOptionVisible = value != null && (value.Head == null || _selectedLocalBranch.Upstream != value.FullName);
             }
         }