diff --git a/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html b/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html
index 0e749da..179988b 100644
--- a/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html
@@ -65,7 +65,7 @@
         }
       </div>
       <ul class="nav nav-tabs fill-width pull-left" id="pullreq-tab">
-        <li class="active"><a href="#conversation">Conversation <span class="badge">@comments.flatMap @{
+        <li><a href="#conversation">Conversation <span class="badge">@comments.flatMap @{
           case comment: IssueComment => Some(comment)
           case _: CommitComment => None
         }.size</span></a></li>
@@ -73,7 +73,7 @@
         <li><a href="#files">Files Changed <span class="badge">@diffs.size</span></a></li>
       </ul>
       <div class="tab-content fill-width pull-left">
-        <div class="tab-pane active" id="conversation">
+        <div class="tab-pane" id="conversation">
           @flash.get("error").map{ error =>
             <div class="alert alert-error">@error</div>
           }
@@ -94,6 +94,22 @@
 }
 <script>
 $(function(){
+  // Determine active tab from hash
+  if(location.hash == '#commits'){
+    $('li:has(a[href=#commits])').addClass('active');
+    $('div#commits').addClass('active');
+  } else if(location.hash == '#files'){
+    $('li:has(a[href=#files])').addClass('active');
+    $('div#files').addClass('active');
+  } else {
+    $('li:has(a[href=#conversation])').addClass('active');
+    $('div#conversation').addClass('active');
+  }
+  // Set hash when tab is clicked
+  $('ul.nav-tabs li a').click(function(e){
+    location.href = $(e.delegateTarget).attr("href");
+  });
+
   $('#pullreq-tab a').click(function (e) {
     e.preventDefault();
     $(this).tab('show');