diff --git a/galleryscript.js b/galleryscript.js
index a74fa9b..5b6fac0 100644
--- a/galleryscript.js
+++ b/galleryscript.js
@@ -1149,6 +1149,7 @@ function thumblist(n,curr) {
     if (maxThumb%2==1) { nright+=1; nleft+=1; }
     leftstr='<span title="[shift left arrow]" id="arrowleft" class="thumbbox" onclick="thumblist('+String(nleft)+','+String(curr)+')">&larr; <div class="arrowtext">('+ends.first+')</div></span>';
     rightstr='<span title="[shift right arrow]" id="arrowright" class="thumbbox" onclick="thumblist('+String(nright)+','+String(curr)+')">&rarr; <div class="arrowtext">('+(imagelist.length-ends.last)+')</div></span>';
+    rightstr+='<span title="[a]" id="allthumbs" class="thumbbox arrowtext" onclick="allthumbs()">All</span>';
     menustr='<span id="thumbmenu" class="thumbmenu">'+
            ' <span class="menuitem" id="setupbutton" onclick="usersetupflip()">(S)etup</span>';
     thumbstr='<div><span class="headsmall">Images</span>'+menustr+'</div><div id="thumbrow">'+leftstr;
@@ -1202,7 +1203,7 @@ function allthumbs() {
     // Shows all the thumbnails in the current folder
     thumbstr='<div id="thumbrow">';
     for (i=0; i<imagelist.length; i++) {
-        thumbstr+='<span id="n'+i+'" class="imagebox thumbbox"><img title="'+titlestring(imagedesc[i])+'" onclick="showimage('+String(i)+')" src="_tn/tn_'+(encodeURIComponent(imagelist[i]))+'.jpg"></span>';
+        thumbstr+='<span id="n'+i+'" class="imagebox thumbbox"><a href="?p='+(i+1)+'"><img title="'+titlestring(imagedesc[i])+'" onclick="showimage('+String(i)+')" src="_tn/tn_'+(encodeURIComponent(imagelist[i]))+'.jpg"></a></span>';
     }
     thumbstr+='</div>';
     $('#thumbcontainer').html(thumbstr);
diff --git a/gallerystyle.css b/gallerystyle.css
index 93056d8..1858fca 100644
--- a/gallerystyle.css
+++ b/gallerystyle.css
@@ -232,6 +232,20 @@ iframe {
     line-height: 40px;
     font-family: sans-serif;
 }
+#allthumbs {
+    width: 90px;
+    height: 20px;
+    text-align:center;
+    cursor: pointer;
+    background-color: #eee;
+    margin: 37px 2px 2px -31px;
+    line-height: 20px;
+    font-family: sans-serif;
+    font-size: medium;
+    -webkit-transform: rotate(-90deg); 
+    -moz-transform: rotate(-90deg);	
+    filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
+}
 #prevTouch,#nextTouch {
     width: 10%;
     height: inherit;