diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
index f9efb313e..e7b3eb25b 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
@@ -41,9 +41,9 @@ import org.navalplanner.business.common.exceptions.ValidationException;
 import org.navalplanner.business.externalcompanies.entities.ExternalCompany;
 import org.navalplanner.business.orders.entities.HoursGroup;
 import org.navalplanner.business.orders.entities.Order;
-import org.navalplanner.business.orders.entities.Order.SchedulingMode;
 import org.navalplanner.business.orders.entities.OrderElement;
 import org.navalplanner.business.orders.entities.OrderStatusEnum;
+import org.navalplanner.business.orders.entities.Order.SchedulingMode;
 import org.navalplanner.business.templates.entities.OrderTemplate;
 import org.navalplanner.business.users.entities.UserRole;
 import org.navalplanner.web.common.IMessagesForUser;
@@ -1035,13 +1035,20 @@ public class OrderCRUDController extends GenericForwardComposer {
         orderModel.prepareForCreate();
     }
 
-    public void editNewCreatedOrder() {
+    private void editNewCreatedOrder() {
         showOrderElementFilter();
         hideCreateButtons();
         prepareEditWindow();
         showEditWindow(_("Create project"));
     }
 
+    public void editNewCreatedOrder(Window detailsWindow) {
+        editNewCreatedOrder();
+        // close project details window
+        detailsWindow.setVisible(false);
+        saveAndContinue();
+    }
+
     public ProjectDetailsController getCreationPopup() {
         if (projectDetailsController == null) {
             projectDetailsController = new ProjectDetailsController();
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ProjectDetailsController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ProjectDetailsController.java
index 0f2d16c60..f3c10151f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ProjectDetailsController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ProjectDetailsController.java
@@ -122,8 +122,7 @@ public class ProjectDetailsController extends GenericForwardComposer {
             if (tabs != null) {
                 tabs.goToOrdersList();
             }
-            orderController.editNewCreatedOrder();
-            close();
+            orderController.editNewCreatedOrder(window);
         }
     }