diff --git a/tornado_gallery/static/photo.thtml b/tornado_gallery/static/photo.thtml
index af1a0c6..214b4d1 100644
--- a/tornado_gallery/static/photo.thtml
+++ b/tornado_gallery/static/photo.thtml
@@ -52,11 +52,11 @@ body {
 	<table width="100%" class="controls" id="controls">
 	<tr>
 		<td class="firstlink"><a class="button" accesskey="["
-			href="{{site_uri}}/{{gallery.name}}/{{gallery.first}}?{{page_query}}"><img
+			href="{{site_uri}}/{{gallery.name}}/{{gallery.first}}/photo.html?{{page_query}}"><img
 				alt="|&lt;- First" src="{{static_uri}}/images/start.png"
 				border="0" align="absmiddle" /></a></td>
 		<td class="prevlink"><a class="button" accesskey=","
-			href="{{site_uri}}/{{gallery.name}}/{{photo.prev}}?{{page_query}}"><img
+			href="{{site_uri}}/{{gallery.name}}/{{photo.prev}}/photo.html?{{page_query}}"><img
 				alt="&lt;- Prev" src="{{static_uri}}/images/back.png"
 				border="0" align="absmiddle" /></a></td>
 		<td class="status"><a class="button" accesskey="l"
@@ -73,10 +73,10 @@ body {
 				src="{{static_uri}}/images/top.png"
 				border="0" align="absmiddle" /></a></td>
 		<td class="nextlink"><a class="button" accesskey="."
-			href="{{site_uri}}/{{gallery.name}}/{{photo.next}}?{{page_query}}"><img alt="-&gt; Next" src="{{static_uri}}/images/forward.png" border="0"
+			href="{{site_uri}}/{{gallery.name}}/{{photo.next}}/photo.html?{{page_query}}"><img alt="-&gt; Next" src="{{static_uri}}/images/forward.png" border="0"
 				align="absmiddle" /></a></td>
 		<td class="lastlink"><a class="button" accesskey="]"
-			href="{{site_uri}}/{{gallery.name}}/{{gallery.last}}?{{page_query}}"><img
+			href="{{site_uri}}/{{gallery.name}}/{{gallery.last}}/photo.html?{{page_query}}"><img
 				alt="-&gt;| Last" src="{{static_uri}}/images/finish.png"
 				border="0" align="absmiddle" /></a></td>
 	</tr>