diff --git a/pkg/handler/commits.go b/pkg/handler/commits.go
index aad1120b8..442b1f948 100644
--- a/pkg/handler/commits.go
+++ b/pkg/handler/commits.go
@@ -121,9 +121,13 @@ func (h *CommitRebuildHandler) CommitRebuild(w http.ResponseWriter, r *http.Requ
 	hash := r.FormValue(":commit")
 	labl := r.FormValue(":label")
 	host := r.FormValue(":host")
+	branch := r.FormValue("branch")
+	if branch == "" {
+		branch = "master"
+	}
 
 	// get the commit from the database
-	commit, err := database.GetCommitHash(hash, repo.ID)
+	commit, err := database.GetCommitBranchHash(branch, hash, repo.ID)
 	if err != nil {
 		return err
 	}
@@ -157,9 +161,9 @@ func (h *CommitRebuildHandler) CommitRebuild(w http.ResponseWriter, r *http.Requ
 	h.queue.Add(&queue.BuildTask{Repo: repo, Commit: commit, Build: build})
 
 	if labl != "" {
-		http.Redirect(w, r, fmt.Sprintf("/%s/%s/%s/commit/%s/build/%s", host, repo.Owner, repo.Name, hash, labl), http.StatusSeeOther)
+		http.Redirect(w, r, fmt.Sprintf("/%s/%s/%s/commit/%s/build/%s?branch=%s", host, repo.Owner, repo.Name, hash, labl, branch), http.StatusSeeOther)
 	} else {
-		http.Redirect(w, r, fmt.Sprintf("/%s/%s/%s/commit/%s", host, repo.Owner, repo.Name, hash), http.StatusSeeOther)
+		http.Redirect(w, r, fmt.Sprintf("/%s/%s/%s/commit/%s?branch=%s", host, repo.Owner, repo.Name, hash, branch), http.StatusSeeOther)
 	}
 
 	return nil
diff --git a/pkg/template/pages/repo_commit.html b/pkg/template/pages/repo_commit.html
index 8a743f6f2..dfc41ca6d 100644
--- a/pkg/template/pages/repo_commit.html
+++ b/pkg/template/pages/repo_commit.html
@@ -28,7 +28,7 @@
       <div class="actions">
 				{{ if .IsAdmin }}
 					{{ if not .Build.IsRunning }}
-					<form action="/{{.Repo.Slug}}/commit/{{.Commit.Hash}}/rebuild"
+					<form action="/{{.Repo.Slug}}/commit/{{.Commit.Hash}}/rebuild?branch={{ .Commit.Branch }}"
 								method="POST">
 						<input class="btn btn-default" type="submit" value="Rebuild"/>
 					</form>