diff --git a/src/project/WorkingSetView.js b/src/project/WorkingSetView.js
index fa5ab3c4505..be2cd636f2b 100644
--- a/src/project/WorkingSetView.js
+++ b/src/project/WorkingSetView.js
@@ -228,7 +228,11 @@ define(function (require, exports, module) {
             // If file wasnt moved open or close it
             if (!moved) {
                 if (!fromClose) {
-                    FileViewController.openAndSelectDocument($listItem.data(_FILE_KEY).fullPath, FileViewController.WORKING_SET_VIEW);
+                    if (selected) {
+                        CommandManager.execute(Commands.FILE_RENAME);
+                    } else {
+                        FileViewController.openAndSelectDocument($listItem.data(_FILE_KEY).fullPath, FileViewController.WORKING_SET_VIEW);
+                    }
                 } else {
                     CommandManager.execute(Commands.FILE_CLOSE, {file: $listItem.data(_FILE_KEY)});
                 }