diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index d2aea3d27a..6ccca57c54 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -33,6 +33,13 @@ func getForkRepository(ctx *middleware.Context) *models.Repository {
 		}
 		return nil
 	}
+
+	// Cannot fork bare repo.
+	if forkRepo.IsBare {
+		ctx.Handle(404, "", nil)
+		return nil
+	}
+
 	ctx.Data["repo_name"] = forkRepo.Name
 	ctx.Data["desc"] = forkRepo.Description
 	ctx.Data["IsPrivate"] = forkRepo.IsPrivate
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index 74e04d0988..141c5514cf 100644
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -2,13 +2,15 @@
 <div class="ui container"><!-- start container -->
 	<div class="ui vertically padded grid head"><!-- start grid -->
 		<div class="column"><!-- start column -->
+			{{if not .IsBare}}
 			<div class="ui black small compact menu floated right count labelled">
-				<a class="item{{if $.IsRepositoryOwner}} poping up{{end}}"{{if not $.IsRepositoryOwner}} href="{{AppSubUrl}}/repo/fork/{{.ID}}"{{else}} data-content="{{$.i18n.Tr "repo.fork_from_self"}}" data-position="top center" data-variation="tiny"{{end}}>
+				<a class="item{{if eq .OwnerID $.SignedUserID}} poping up{{end}}"{{if not (eq .OwnerID $.SignedUserID)}} href="{{AppSubUrl}}/repo/fork/{{.ID}}"{{else}} data-content="{{$.i18n.Tr "repo.fork_from_self"}}" data-position="top center" data-variation="tiny"{{end}}>
 					<i class="icon octicon octicon-repo-forked"></i>
 					{{$.i18n.Tr "repo.fork"}}
 				</a>
 				<span class="active item num">{{.NumForks}}</span>
 			</div>
+			{{end}}
 
 			<div class="ui black small compact menu floated right count labelled">
 				<a class="item" href="{{$.RepoLink}}/action/{{if $.IsStaringRepo}}un{{end}}star?redirect_to={{$.Link}}">
diff --git a/templates/repo/header_old.tmpl b/templates/repo/header_old.tmpl
index ecf9ed3a7f..0537cc0244 100644
--- a/templates/repo/header_old.tmpl
+++ b/templates/repo/header_old.tmpl
@@ -48,6 +48,7 @@
                     </button>
                 </a>
             </li>
+            {{if not .IsBare}}
             <li id="repo-header-fork">
                 <a id="repo-header-fork-btn" {{if or (not $.IsRepositoryAdmin) $.Owner.IsOrganization}}href="{{AppSubUrl}}/repo/fork/{{.ID}}"{{end}}>
                     <button class="btn btn-gray text-bold btn-radius">
@@ -57,6 +58,7 @@
                 </a>
             
             </li>
+            {{end}}
         </ul>
     </div>
 </div>