diff --git a/config/routes.rb b/config/routes.rb
index bf9966cb..8956e3c9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -206,7 +206,7 @@ ActionController::Routing::Routes.draw do |map|
       project_actions.connect 'projects/new', :action => 'add'
       project_actions.connect 'projects', :action => 'add'
       project_actions.connect 'projects.:format', :action => 'add', :format => /xml/
-      project_actions.connect 'projects/:id/:action', :action => /destroy|archive|unarchive/
+      project_actions.connect 'projects/:id/:action', :action => /edit|destroy|archive|unarchive/
       project_actions.connect 'projects/:id/files/new', :action => 'add_file'
       project_actions.connect 'projects/:id/versions/new', :action => 'add_version'
       project_actions.connect 'projects/:id/categories/new', :action => 'add_issue_category'
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 6c88e41d..6de55d1b 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -313,6 +313,13 @@ class ProjectsControllerTest < ActionController::TestCase
     assert_template 'settings'
   end
   
+  def test_edit_routing
+    assert_routing(
+      {:method => :post, :path => '/projects/4223/edit'},
+      :controller => 'projects', :action => 'edit', :id => '4223'
+    )
+  end
+  
   def test_edit
     @request.session[:user_id] = 2 # manager
     post :edit, :id => 1, :project => {:name => 'Test changed name',