diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index e4996966..a152884d 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -134,8 +134,8 @@ class AdminController < ApplicationController
       flash[:info] = "File(s) successfully deleted." if some_deleted
     else
       flash[:error] = password_error(params['system_password'])
-    end  
-    redirect_to :controller => 'wiki', :web => @web_name, :action => 'file_list'
+    end
+    redirect_to :back
   end
 
 private
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index f9812e26..535970b2 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -54,7 +54,16 @@ class WikiController < ApplicationController
   end
   
   def file_list
-    @web.file_list
+    sort_order = params['sort_order'] || 'file_name'
+    case sort_order
+      when 'file_name'
+        @alt_sort_order = 'created_at'
+        @alt_sort_name = 'date'
+      else
+        @alt_sort_order = 'file_name'
+        @alt_sort_name = 'filename'
+    end
+    @file_list = @web.file_list(sort_order)
   end
   
   def export_html
diff --git a/app/models/web.rb b/app/models/web.rb
index 6bacace4..2283407c 100644
--- a/app/models/web.rb
+++ b/app/models/web.rb
@@ -47,8 +47,8 @@ class Web < ActiveRecord::Base
     WikiFile.find_by_file_name(file_name) != nil
   end
   
-  def file_list
-    WikiFile.find(:all, :order => 'file_name')
+  def file_list(sort_order = 'file_name')
+    WikiFile.all(:order => sort_order, :conditions => ['web_id = ?', id])
   end
 
   def description(file_name)
diff --git a/app/views/wiki/file_list.html.erb b/app/views/wiki/file_list.html.erb
index 3e815317..8b8c1b5b 100644
--- a/app/views/wiki/file_list.html.erb
+++ b/app/views/wiki/file_list.html.erb
@@ -8,18 +8,23 @@
     Uploaded Files in <%= @web.name %>
   </h2>
 
-<p>Check the files you wish to delete.</p>
-<ul style="list-style-type:none">
-  <%- for @file in @web.file_list -%>
+<%- if @file_list.empty? -%>
+  <p>No uploaded files in this Web</p>
+<%- else -%>
+  <p>Check the files you wish to delete (<%= link_to "sort by #{@alt_sort_name}", :controller => 'wiki',
+      :web => @web.address, :action => 'file_list', :sort_order => @alt_sort_order %>).</p>
+  <ul style="list-style-type:none">
+  <%- for file in @file_list -%>
     <li>
-      <input type="checkbox" name="<%= @file.file_name %>" value="delete"/>
+      <input type="checkbox" name="<%= file.file_name %>" value="delete"/>
       <a href="<%= url_for :web => @web.address, :action => 'file', 
-            :id => @file.file_name %>"><%= @file.file_name%></a>
+            :id => file.file_name %>"><%= file.file_name%></a> (<%= file.created_at.asctime %>)
     </li>
   <%- end -%>
-</ul>
-    <label for="system_password">Enter system password</label>
-    <%= password_field_tag "system_password", '', :class => "disableAutoComplete" %>
+  </ul>
+  <label for="system_password">Enter system password</label>
+  <%= password_field_tag "system_password", '', :class => "disableAutoComplete" %>
     and <%= submit_tag("Delete Files") %>
+<%- end -%>
 </div>
-<%- end %>
\ No newline at end of file
+<%- end -%>
\ No newline at end of file