diff --git a/index.html b/index.html
index 0d04f780..b1070f69 100644
--- a/index.html
+++ b/index.html
@@ -40,7 +40,7 @@
     </head>
     <body role="application">
         <section id="search-article" role="region">
-            <header>
+            <header id="top">
                 <div class="navbar">
                     <div class="container">
                         <!-- .navbar-toggle is used as the toggle for collapsed navbar content -->
@@ -132,6 +132,7 @@
                 <div id="navigationButtons" class="btn-toolbar">
                     <a class="btn btn-large" id="btnBack" title="Back"><span class="glyphicon glyphicon-circle-arrow-left"></span></a>
                     <a class="btn btn-large" id="btnForward" title="Forward"><span class="glyphicon glyphicon-circle-arrow-right"></span></a>
+                    <a class="btn btn-large pull-right" id="btnTop" title="Top" href="#top"><span class="glyphicon glyphicon-arrow-up"></span></a>
                 </div>
             </footer>
         </section>
diff --git a/js/app.js b/js/app.js
index 3fa795a5..91be5d64 100644
--- a/js/app.js
+++ b/js/app.js
@@ -378,7 +378,7 @@ define(function(require) {
     function pushBrowserHistoryState(titleName) {
         if (titleName) {
             var stateObj = {titleName: titleName};
-            window.history.pushState(stateObj, "Wikipedia Article : " + titleName, "#" + titleName);
+            window.history.pushState(stateObj, "Wikipedia Article : " + titleName, "?title=" + titleName);
         }
     }
 
