diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java
index e2e4ea710..7f4a69ab5 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/PersonalTimesheetController.java
@@ -291,6 +291,7 @@ public class PersonalTimesheetController extends GenericForwardComposer
                             value));
                 }
             });
+            addOnOkEventToClosePopup(effortTextbox);
             personalTimesheetPopupEffort.appendChild(effortTextbox);
 
             personalTimesheetPopupFinished.getChildren().clear();
@@ -313,11 +314,22 @@ public class PersonalTimesheetController extends GenericForwardComposer
                 finishedCheckbox.setDisabled(personalTimesheetModel
                         .isFinished(orderElement));
             }
+            addOnOkEventToClosePopup(finishedCheckbox);
             personalTimesheetPopupFinished.appendChild(finishedCheckbox);
 
             return effortTextbox;
         }
 
+        private boolean addOnOkEventToClosePopup(Component component) {
+            return component.addEventListener(Events.ON_OK,
+                    new EventListener() {
+                @Override
+                public void onEvent(Event event) throws Exception {
+                    closePersonalTimesheetPopup();
+                }
+            });
+        }
+
         private void markAsModified(final Textbox textbox) {
             textbox.setStyle("font-weight: bold");
         }