diff --git a/src/css/builder.css b/src/css/builder.css
index 6ec9b547..d5c76ff7 100644
--- a/src/css/builder.css
+++ b/src/css/builder.css
@@ -1344,6 +1344,11 @@ div.propertyItems label[for|=id] {
     font-weight: bold;
 }
 
+.titleBar input {
+    width: 150px;
+    margin: 3px;
+}
+
 .openButton {
     background-image: url("images/openButton_up.png");
     background-repeat: no-repeat;
diff --git a/src/js/views/project.js b/src/js/views/project.js
index 6d82e466..453752f5 100644
--- a/src/js/views/project.js
+++ b/src/js/views/project.js
@@ -361,7 +361,34 @@
                            '-webkit-transform-origin':'2 2'});
         },
         _buttonEvents: function(box, pid, widget) {
-            var openHandler, cloneHandler, deleteHandler;
+            var renameHandler, openHandler, cloneHandler, deleteHandler;
+            renameHandler = function(e) {
+                var spanElement = $(this),
+                    renameProject = function(e, inputElement, spanElement) {
+                        var projectName = inputElement.val();
+                        if (projectName.trim() == '')
+                            projectName = 'Untitled'
+                        $.rib.pmUtils.setProperty(pid, "name", projectName);
+                        spanElement.html(projectName);
+                        spanElement.show();
+                        inputElement.remove();
+                    };
+
+                spanElement.hide();
+                $('<input>')
+                    .attr('type', 'text')
+                    .val(spanElement.html())
+                    .appendTo(spanElement.parent())
+                    .keydown(function(e) {
+                        if(e.keyCode == '13') {
+                            renameProject(e, $(this), spanElement);
+                        }
+                    })
+                    .blur(function(e) {
+                        renameProject(e, $(this), spanElement);
+                    })
+                    .focus();
+            };
             openHandler = function () {
                 var success = function () {
                     // show the layout tab
@@ -397,6 +424,7 @@
                     $.rib.pmUtils.deleteProject(pid, success);
                 });
             };
+            box.find('.titleBar > span').dblclick(renameHandler);
             box.find('.openButton').click(openHandler);
             box.find('.clone.button').click(cloneHandler);
             box.find('.delete.button').click(deleteHandler);