diff --git a/docs/client/layout.html b/docs/client/layout.html
index d7a44328f1..e095b59005 100644
--- a/docs/client/layout.html
+++ b/docs/client/layout.html
@@ -16,7 +16,7 @@
     {{> topBar}}
     <div class="main-content">
       <div id="main">
-        <div id="top"></div>
+        <div><div id="top"></div></div>
         <div class="{{layoutHidden 'full'}}">
           {{> fullApiContent}}
         </div>
diff --git a/docs/client/links.js b/docs/client/links.js
index d1334d4ea2..2cdca84f89 100644
--- a/docs/client/links.js
+++ b/docs/client/links.js
@@ -29,6 +29,8 @@ Meteor.startup(function () {
     Tracker.afterFlush(function () {
       $.waypoints('destroy');
 
+      // XXX this timeout is a temporary hack to yield more before setting the
+      // waypoints.
       setTimeout(function () {
         $('.main-content :not(.hidden) [id]').each(function (i, el) {
           if (! $("#nav [href='#/" + docsType + '/' + el.id + "']").get(0)) {
@@ -89,7 +91,7 @@ Tracker.autorun(function () {
 
       if (! id) {
         // will scroll to the very top
-        id = "main";
+        id = "top";
       }
 
       // XXX this selector is tied to the structure of the document so tightly