diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 199b2f0..afd7f65 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -204,7 +204,10 @@ class ProjectsController < ApplicationController
   end
   
   def list_files
-    @versions = @project.versions.sort.reverse
+    sort_init "#{Attachment.table_name}.filename", "asc"
+    sort_update
+    @versions = @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse
+    render :layout => !request.xhr?
   end
   
   # Show changelog for @project
diff --git a/app/views/projects/list_files.rhtml b/app/views/projects/list_files.rhtml
index ec4a361..f385229 100644
--- a/app/views/projects/list_files.rhtml
+++ b/app/views/projects/list_files.rhtml
@@ -9,10 +9,10 @@
 <table class="list">
   <thead><tr>
     <th><%=l(:field_version)%></th>
-    <th><%=l(:field_filename)%></th>
-    <th><%=l(:label_date)%></th>
-    <th><%=l(:field_filesize)%></th>
-    <th><%=l(:label_downloads_abbr)%></th>
+    <%= sort_header_tag("#{Attachment.table_name}.filename", :caption => l(:field_filename)) %>
+    <%= sort_header_tag("#{Attachment.table_name}.created_on", :caption => l(:label_date), :default_order => 'desc') %>
+    <%= sort_header_tag("#{Attachment.table_name}.filesize", :caption => l(:field_filesize), :default_order => 'desc') %>
+    <%= sort_header_tag("#{Attachment.table_name}.downloads", :caption => l(:label_downloads_abbr), :default_order => 'desc') %>
     <th>MD5</th>
     <% if delete_allowed %><th></th><% end %>
   </tr></thead>