diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl
index ed3a907f7..3c8753c36 100644
--- a/templates/explore/repo_list.tmpl
+++ b/templates/explore/repo_list.tmpl
@@ -1,25 +1,71 @@
 <div class="ui repository list">
 	{{range .Repos}}
-		{{if (or (eq .Owner.Visibility 1) (and ($.SignedUser) (or (eq .Owner.Visibility 2) (and (.Owner.IsUserOrgPartOf $.SignedUserID) (eq .Owner.Visibility 3)) ($.IsAdmin))))}}
-		<div class="item">
-			<div class="ui header">
-				<a class="name" href="{{AppSubUrl}}/{{if .Owner}}{{.Owner.Name}}{{else if $.Org}}{{$.Org.Name}}{{else}}{{$.Owner.Name}}{{end}}/{{.Name}}">{{if or $.PageIsExplore $.PageIsProfileStarList }}{{.Owner.Name}} / {{end}}{{.Name}}</a>
-				{{if .IsPrivate}}
-					<span class="text gold"><i class="octicon octicon-lock"></i></span>
-				{{else if .IsFork}}
-					<span><i class="octicon octicon-repo-forked"></i></span>
-				{{else if .IsMirror}}
-					<span><i class="octicon octicon-repo-clone"></i></span>
-				{{end}}
+		{{if .Owner}}
+			{{if (or (eq .Owner.Visibility 1) (and ($.SignedUser) (or (eq .Owner.Visibility 2) (and (.Owner.IsUserOrgPartOf $.SignedUserID) (eq .Owner.Visibility 3)) ($.IsAdmin))))}}
+			<div class="item">
+				<div class="ui header">
+					<a class="name" href="{{AppSubUrl}}/{{if .Owner}}{{.Owner.Name}}{{else if $.Org}}{{$.Org.Name}}{{else}}{{$.Owner.Name}}{{end}}/{{.Name}}">{{if or $.PageIsExplore $.PageIsProfileStarList }}{{.Owner.Name}} / {{end}}{{.Name}}</a>
+					{{if .IsPrivate}}
+						<span class="text gold"><i class="octicon octicon-lock"></i></span>
+					{{else if .IsFork}}
+						<span><i class="octicon octicon-repo-forked"></i></span>
+					{{else if .IsMirror}}
+						<span><i class="octicon octicon-repo-clone"></i></span>
+					{{end}}
 
-				<div class="ui right metas">
-					<span class="text grey"><i class="octicon octicon-star"></i> {{.NumStars}}</span>
-					<span class="text grey"><i class="octicon octicon-git-branch"></i> {{.NumForks}}</span>
+					<div class="ui right metas">
+						<span class="text grey"><i class="octicon octicon-star"></i> {{.NumStars}}</span>
+						<span class="text grey"><i class="octicon octicon-git-branch"></i> {{.NumForks}}</span>
+					</div>
 				</div>
+				{{if .DescriptionHTML}}<p class="has-emoji">{{.DescriptionHTML}}</p>{{end}}
+				<p class="time">{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Updated $.i18n.Lang}}</p>
 			</div>
-			{{if .DescriptionHTML}}<p class="has-emoji">{{.DescriptionHTML}}</p>{{end}}
-			<p class="time">{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Updated $.i18n.Lang}}</p>
-		</div>
+			{{end}}
+		{{else if $.Org}}
+			{{if (or (eq $.Org.Visibility 1) (and ($.SignedUser) (or (eq $.Org.Visibility 2) (and ($.Org.IsUserOrgPartOf $.SignedUserID) (eq $.Org.Visibility 3)) ($.IsAdmin))))}}
+			<div class="item">
+				<div class="ui header">
+					<a class="name" href="{{AppSubUrl}}/{{if .Owner}}{{.Owner.Name}}{{else if $.Org}}{{$.Org.Name}}{{else}}{{$.Owner.Name}}{{end}}/{{.Name}}">{{if or $.PageIsExplore $.PageIsProfileStarList }}{{.Owner.Name}} / {{end}}{{.Name}}</a>
+					{{if .IsPrivate}}
+						<span class="text gold"><i class="octicon octicon-lock"></i></span>
+					{{else if .IsFork}}
+						<span><i class="octicon octicon-repo-forked"></i></span>
+					{{else if .IsMirror}}
+						<span><i class="octicon octicon-repo-clone"></i></span>
+					{{end}}
+
+					<div class="ui right metas">
+						<span class="text grey"><i class="octicon octicon-star"></i> {{.NumStars}}</span>
+						<span class="text grey"><i class="octicon octicon-git-branch"></i> {{.NumForks}}</span>
+					</div>
+				</div>
+				{{if .DescriptionHTML}}<p class="has-emoji">{{.DescriptionHTML}}</p>{{end}}
+				<p class="time">{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Updated $.i18n.Lang}}</p>
+			</div>
+			{{end}}
+		{{else}}
+			{{if (or (eq $.Owner.Visibility 1) (and ($.SignedUser) (or (eq $.Owner.Visibility 2) (and ($.Owner.IsUserOrgPartOf $.SignedUserID) (eq $.Owner.Visibility 3)) ($.IsAdmin))))}}
+			<div class="item">
+				<div class="ui header">
+					<a class="name" href="{{AppSubUrl}}/{{if .Owner}}{{.Owner.Name}}{{else if $.Org}}{{$.Org.Name}}{{else}}{{$.Owner.Name}}{{end}}/{{.Name}}">{{if or $.PageIsExplore $.PageIsProfileStarList }}{{.Owner.Name}} / {{end}}{{.Name}}</a>
+					{{if .IsPrivate}}
+						<span class="text gold"><i class="octicon octicon-lock"></i></span>
+					{{else if .IsFork}}
+						<span><i class="octicon octicon-repo-forked"></i></span>
+					{{else if .IsMirror}}
+						<span><i class="octicon octicon-repo-clone"></i></span>
+					{{end}}
+
+					<div class="ui right metas">
+						<span class="text grey"><i class="octicon octicon-star"></i> {{.NumStars}}</span>
+						<span class="text grey"><i class="octicon octicon-git-branch"></i> {{.NumForks}}</span>
+					</div>
+				</div>
+				{{if .DescriptionHTML}}<p class="has-emoji">{{.DescriptionHTML}}</p>{{end}}
+				<p class="time">{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Updated $.i18n.Lang}}</p>
+			</div>
+			{{end}}
 		{{end}}
 	{{else}}
 	<div>