diff --git a/_embed/templates/base.tmpl b/_embed/templates/base.tmpl
index c33ea58f..3a6130ec 100644
--- a/_embed/templates/base.tmpl
+++ b/_embed/templates/base.tmpl
@@ -55,8 +55,8 @@
                         <a href="{{ $absURL }}{{ $item.URL }}"><li>{{ $item.Name }}</li></a>
                     {{- end }}
                     </ul>
-                    {{- end }}
                 </div>
+                {{- end }}
                 
                 <p>{{ if ne .Name "/"}}{{ .Name }}{{ else }}Root{{ end }}</p>
             </div>
@@ -118,8 +118,11 @@
                 </div>
                 {{- end }}
                 
-                <div data-dropdown class="action" id="download">
+                <div {{ if .IsDir }}data-dropdown{{ end }} class="action" id="download">
+                    {{- if not .IsDir}}<a href="?download=true">{{ end }}
                     <i class="material-icons" title="Download">file_download</i><span>Download</span>
+                    {{- if not .IsDir}}</a>{{ end }}
+                    
                     {{- if .IsDir }}
                     <ul class="dropdown" id="download-drop">
                         <a data-format="tarbz2" href="?download=tarbz2"><li>tar.bz2</li></a>