diff --git a/godoc/static/codewalk.html b/godoc/static/codewalk.html
index 313f1f66..0f3d22a2 100644
--- a/godoc/static/codewalk.html
+++ b/godoc/static/codewalk.html
@@ -35,7 +35,7 @@
     <div id="comment-area">
       {{range .Step}}
       <div class="comment first last">
-        <a class="comment-link" href="/doc/codewalk/?fileprint=/{{urlquery .File}}&lo={{urlquery .Lo}}&hi={{urlquery .Hi}}#mark" target="code-display"></a>
+        <a class="comment-link" href="/doc/codewalk/?fileprint=/{{urlquery .File}}&amp;lo={{urlquery .Lo}}&amp;hi={{urlquery .Hi}}#mark" target="code-display"></a>
         <div class="comment-title">{{html .Title}}</div>
         <div class="comment-text">
 	{{with .Err}}
diff --git a/godoc/static/static.go b/godoc/static/static.go
index ede537b0..b6852dd2 100644
--- a/godoc/static/static.go
+++ b/godoc/static/static.go
@@ -40,7 +40,7 @@ var Files = map[string]string{
     <div id="comment-area">
       {{range .Step}}
       <div class="comment first last">
-        <a class="comment-link" href="/doc/codewalk/?fileprint=/{{urlquery .File}}&lo={{urlquery .Lo}}&hi={{urlquery .Hi}}#mark" target="code-display"></a>
+        <a class="comment-link" href="/doc/codewalk/?fileprint=/{{urlquery .File}}&amp;lo={{urlquery .Lo}}&amp;hi={{urlquery .Hi}}#mark" target="code-display"></a>
         <div class="comment-title">{{html .Title}}</div>
         <div class="comment-text">
 	{{with .Err}}