fixed

Author: Martin Plieske

src/main/java/de/doubleslash/keeptime/Main.java

@@ -221,6 +221,7 @@ private void initialisePopupUI(final Stage primaryStage) throws IOException {
       // Give the controller access to the main app.
       popupViewStage.setAlwaysOnTop(true);
       final ViewControllerPopup viewControllerPopupController = loader.getController();
+      viewControllerPopupController.setMainStage(primaryStage);
       viewControllerPopupController.setStage(popupViewStage);
       viewControllerPopupController.setControllerAndModel(controller, model);
       globalScreenListener.setViewController(viewControllerPopupController);

src/main/java/de/doubleslash/keeptime/viewpopup/ViewControllerPopup.java

@@ -52,13 +52,18 @@ public class ViewControllerPopup {
    private ListView<Project> projectListView;
 
    private Stage stage;
+   private Stage mainStage;
 
    private Controller controller;
 
    private Model model;
 
    private FilteredList<Project> filteredData;
 
+   public void setMainStage(final Stage mainStage) {
+      this.mainStage = mainStage;
+   }
+
    private void changeProject(final Project item) {
       LOG.info("Change project to '{}'.", item.getName());
 
@@ -69,9 +74,11 @@ private void changeProject(final Project item) {
             "Add a note for '" + model.activeWorkItem.get().getProject().getName() + "' before changing project?");
       dialog.setContentText("Note: ");
 
-      this.stage.setAlwaysOnTop(false);
-      final Optional<String> result = dialog.showAndWait();
+      mainStage.setAlwaysOnTop(false);
       this.stage.setAlwaysOnTop(true);
+      final Optional<String> result = dialog.showAndWait();
+      this.stage.setAlwaysOnTop(false);
+      mainStage.setAlwaysOnTop(true);
 
       result.ifPresent(note -> {
          controller.setComment(note);