diff --git a/app/views/projects/edit.js.erb b/app/views/projects/edit.js.erb
index e5c087ca..e4dd0736 100644
--- a/app/views/projects/edit.js.erb
+++ b/app/views/projects/edit.js.erb
@@ -11,6 +11,7 @@ function remove_edit_form() {
 function show_edit_form() {
   $('div#<%=dom_id(@project, 'edit')%>').html(html_for_edit_form());
   $('div#<%=dom_id(@project, 'edit')%>').fadeIn(500);
+  $('div#project_name').editable('disable');
 }
 
 function set_focus() {
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 447790cb..232ae12c 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -776,12 +776,14 @@ var ProjectListPage = {
 
         /* submit project form after edit */
         $("form.edit-project-form button.positive").live('click', function (ev) {
+            $('div#project_name').editable('enable');
             submit_with_ajax_and_block_element('form.edit-project-form', $(this));
             return false;
         });
 
         /* cancel edit project form */
         $('form.edit-project-form a.negative').live('click', function(){
+            $('div#project_name').editable('enable');
             $(this).parents('.edit-form').fadeOut(200, function () {
                 $(this).parents('.list').find('.project').fadeIn(500);
                 $(this).parents('.container').find('.item-show').fadeIn(500);