diff --git a/src/main/scala/view/helpers.scala b/src/main/scala/view/helpers.scala
index 25c744d..3a868b1 100644
--- a/src/main/scala/view/helpers.scala
+++ b/src/main/scala/view/helpers.scala
@@ -67,6 +67,11 @@
       .replaceAll("\\[user:([^\\s]+?)\\]"                        , s"""<a href="${context.path}/$$1">$$1</a>""")
     )
 
+  /**
+   * URL encode except '/'.
+   */
+  def encodeBranchName(value: String): String = StringUtil.urlEncode(value).replace("%2F", "/")
+
   def urlEncode(value: String): String = StringUtil.urlEncode(value)
 
   def urlEncode(value: Option[String]): String = value.map(urlEncode).getOrElse("")
diff --git a/src/main/twirl/pulls/compare.scala.html b/src/main/twirl/pulls/compare.scala.html
index 3c893a2..ba442ff 100644
--- a/src/main/twirl/pulls/compare.scala.html
+++ b/src/main/twirl/pulls/compare.scala.html
@@ -27,7 +27,7 @@
       }
       @helper.html.dropdown(originId, "base") {
         @originRepository.branchList.map { branch =>
-          <li><a href="#" class="origin-branch" data-name="@branch">@helper.html.checkicon(branch == originId) @branch</a></li>
+          <li><a href="#" class="origin-branch" data-name="@encodeBranchName(branch)">@helper.html.checkicon(branch == originId) @branch</a></li>
         }
       }
       ...
@@ -38,7 +38,7 @@
       }
       @helper.html.dropdown(forkedId, "compare") {
         @forkedRepository.branchList.map { branch =>
-          <li><a href="#" class="forked-branch" data-name="@branch">@helper.html.checkicon(branch == forkedId) @branch</a></li>
+          <li><a href="#" class="forked-branch" data-name="@encodeBranchName(branch)">@helper.html.checkicon(branch == forkedId) @branch</a></li>
         }
       }
     </div>
diff --git a/src/main/twirl/repo/blob.scala.html b/src/main/twirl/repo/blob.scala.html
index d509e0c..96cd73f 100644
--- a/src/main/twirl/repo/blob.scala.html
+++ b/src/main/twirl/repo/blob.scala.html
@@ -9,12 +9,12 @@
   @html.header("code", repository)
   @tab(branch, repository, "files")
   <div class="head">
-    <a href="@url(repository)/tree/@branch">@repository.name</a> /
+    <a href="@url(repository)/tree/@encodeBranchName(branch)">@repository.name</a> /
     @pathList.zipWithIndex.map { case (section, i) =>
       @if(i == pathList.length - 1){
         @section
       } else {
-        <a href="@url(repository)/tree/@branch/@pathList.take(i + 1).mkString("/")">@section</a> /
+        <a href="@url(repository)/tree/@encodeBranchName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
       }
     }
   </div>
@@ -30,7 +30,7 @@
         </div>
         <div class="btn-group pull-right">
           <a class="btn btn-mini" href="?raw=true">Raw</a>
-          <a class="btn btn-mini" href="@url(repository)/commits/@branch/@pathList.mkString("/")">History</a>
+          <a class="btn btn-mini" href="@url(repository)/commits/@encodeBranchName(branch)/@pathList.mkString("/")">History</a>
         </div>  
       </th>
     </tr>
diff --git a/src/main/twirl/repo/branches.scala.html b/src/main/twirl/repo/branches.scala.html
index f88b6ee..c8c5681 100644
--- a/src/main/twirl/repo/branches.scala.html
+++ b/src/main/twirl/repo/branches.scala.html
@@ -16,7 +16,7 @@
     @branchInfo.map { case (branchName, latestUpdateDate) =>
       <tr>
         <td>
-          <a href="@url(repository)/tree/@branchName">@branchName</a>
+          <a href="@url(repository)/tree/@encodeBranchName(branchName)">@branchName</a>
           @*
           <a href="#" class="btn btn-danger btn-mini">Delete branch</a>
           *@
@@ -28,10 +28,10 @@
           @if(repository.repository.defaultBranch == branchName){
             Base branch
           } else {
-            <a href="@url(repository)/compare/@{repository.repository.defaultBranch}...@branchName">to @{repository.repository.defaultBranch}</a>
+            <a href="@url(repository)/compare/@{encodeBranchName(repository.repository.defaultBranch)}...@{encodeBranchName(branchName)}">to @{repository.repository.defaultBranch}</a>
           }
         </td>
-        <td><a href="@url(repository)/archive/@{branchName}.zip">ZIP</a></td>
+        <td><a href="@url(repository)/archive/@{encodeBranchName(branchName)}.zip">ZIP</a></td>
       </tr>
     }
   </table>
diff --git a/src/main/twirl/repo/commit.scala.html b/src/main/twirl/repo/commit.scala.html
index 17cef3b..9a0805f 100644
--- a/src/main/twirl/repo/commit.scala.html
+++ b/src/main/twirl/repo/commit.scala.html
@@ -26,7 +26,7 @@
             <span class="muted">
               <img src="@assets/common/images/branch.png"/>
               @branches.zipWithIndex.map { case (branch, i) =>
-                <a href="@url(repository)/tree/@branch" class="branch" id="branch-@i">@branch</a>
+                <a href="@url(repository)/tree/@encodeBranchName(branch)" class="branch" id="branch-@i">@branch</a>
               }
             </span>
           }
diff --git a/src/main/twirl/repo/commits.scala.html b/src/main/twirl/repo/commits.scala.html
index efdf3c9..26f0d9a 100644
--- a/src/main/twirl/repo/commits.scala.html
+++ b/src/main/twirl/repo/commits.scala.html
@@ -11,16 +11,16 @@
   @tab(branch, repository, if(pathList.isEmpty) "commits" else "files")
   <div class="head">
     @if(pathList.isEmpty){
-      <a href="@url(repository)/tree/@branch">@repository.name</a> / Commit History
+      <a href="@url(repository)/tree/@encodeBranchName(branch)">@repository.name</a> / Commit History
     }
     @if(pathList.nonEmpty){
       <span class="muted">History for</span>
-      <a href="@url(repository)/tree/@branch">@repository.name</a> /
+      <a href="@url(repository)/tree/@encodeBranchName(branch)">@repository.name</a> /
       @pathList.zipWithIndex.map { case (section, i) =>
         @if(i == pathList.length - 1){
           @section
         } else {
-          <a href="@url(repository)/tree/@branch/@pathList.take(i + 1).mkString("/")">@section</a> /
+          <a href="@url(repository)/tree/@encodeBranchName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
         }
       }
     }
diff --git a/src/main/twirl/repo/files.scala.html b/src/main/twirl/repo/files.scala.html
index 7eb2e15..28cce85 100644
--- a/src/main/twirl/repo/files.scala.html
+++ b/src/main/twirl/repo/files.scala.html
@@ -12,12 +12,12 @@
   <div class="head">
     <div class="pull-right">
       @defining(repository.commitCount){ commitCount =>
-        <a href="@url(repository)/commits/@branch">@if(commitCount > 1000){ @commitCount+ } else { @commitCount } @plural(commitCount, "commit")</a>&nbsp;
+        <a href="@url(repository)/commits/@encodeBranchName(branch)">@if(commitCount > 1000){ @commitCount+ } else { @commitCount } @plural(commitCount, "commit")</a>&nbsp;
       }
     </div>
-    <a href="@url(repository)/tree/@branch">@repository.name</a> /
+    <a href="@url(repository)/tree/@encodeBranchName(branch)">@repository.name</a> /
     @pathList.zipWithIndex.map { case (section, i) =>
-      <a href="@url(repository)/tree/@branch/@pathList.take(i + 1).mkString("/")">@section</a> /
+      <a href="@url(repository)/tree/@encodeBranchName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
     }
   </div>
   <div class="box">
@@ -46,7 +46,7 @@
       @if(pathList.size > 0){
       <tr>
         <td width="16"></td>
-        <td><a href="@url(repository)@if(pathList.size > 1){/tree/@branch/@pathList.init.mkString("/")}">..</a></td>
+        <td><a href="@url(repository)@if(pathList.size > 1){/tree/@encodeBranchName(branch)/@pathList.init.mkString("/")}">..</a></td>
         <td></td>
         <td></td>
       </tr>
@@ -62,9 +62,9 @@
         </td>
         <td>
         @if(file.isDirectory){
-          <a href="@url(repository)/tree@{(branch :: pathList).mkString("/", "/", "/")}@file.name">@file.name</a>
+          <a href="@url(repository)/tree@{(encodeBranchName(branch) :: pathList).mkString("/", "/", "/")}@file.name">@file.name</a>
         } else {
-          <a href="@url(repository)/blob@{(branch :: pathList).mkString("/", "/", "/")}@file.name">@file.name</a>
+          <a href="@url(repository)/blob@{(encodeBranchName(branch) :: pathList).mkString("/", "/", "/")}@file.name">@file.name</a>
         }
         </td>
         <td>@datetime(file.time)</td>
diff --git a/src/main/twirl/repo/tab.scala.html b/src/main/twirl/repo/tab.scala.html
index 9fd7167..f94f282 100644
--- a/src/main/twirl/repo/tab.scala.html
+++ b/src/main/twirl/repo/tab.scala.html
@@ -12,7 +12,7 @@
       style  = "margin-right: 20px;"
     ){
       @repository.branchList.map { branch =>
-        <li><a href="@url(repository)/@if(active=="commits"){commits} else {tree}/@branch">@helper.html.checkicon(id == branch) @branch</a></li>
+        <li><a href="@url(repository)/@if(active=="commits"){commits} else {tree}/@encodeBranchName(branch)">@helper.html.checkicon(id == branch) @branch</a></li>
       }
     }
   </li>