diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js
index 3630cce8bec..ec8b8efa132 100644
--- a/src/project/ProjectManager.js
+++ b/src/project/ProjectManager.js
@@ -125,7 +125,7 @@ define(function (require, exports, module) {
      * @ see getBaseUrl(), setBaseUrl()
      */
     var _projectBaseUrl = "";
-
+    
     /**
      * @private
      * @type {PreferenceStorage}
@@ -1305,6 +1305,11 @@ define(function (require, exports, module) {
         // First make sure the item in the tree is visible - jsTree's rename API doesn't do anything to ensure inline input is visible
         showInTree(entry)
             .done(function (selected) {
+                // Don't try to rename again if we are already renaming
+                if (_isInRename(selected)) {
+                    return;
+                }
+                
                 var isFolder = selected.hasClass("jstree-open") || selected.hasClass("jstree-closed");
         
                 _projectTree.one("rename.jstree", function (event, data) {