diff --git a/src/main/java/de/deadlocker8/smarttime/controller/InsertTimeController.java b/src/main/java/de/deadlocker8/smarttime/controller/InsertTimeController.java
index c3057466bdc0abc0929b557e41f2393d472d72d9..88aee7bc3396ed153663aa2621b8860d5770c56e 100644
--- a/src/main/java/de/deadlocker8/smarttime/controller/InsertTimeController.java
+++ b/src/main/java/de/deadlocker8/smarttime/controller/InsertTimeController.java
@@ -81,7 +81,6 @@ public class InsertTimeController
 		}
 
 		comboBoxProject.getItems().addAll(objects);
-		comboBoxProject.getSelectionModel().select(settings.getLastProject());
 		comboBoxProject.setStyle("-fx-font-family: \"Arial\";-fx-font-size: 15px;");
 
 		comboBoxTask.setStyle("-fx-font-family: \"Arial\";-fx-font-size: 15px;");
@@ -104,6 +103,9 @@ public class InsertTimeController
 			}
 		});
 
+		comboBoxProject.getSelectionModel().select(settings.getLastProject());
+		comboBoxTask.getSelectionModel().select(settings.getLastTask());
+
 		timePicker1Controller.setController(this);
 		timePicker2Controller.setController(this);
 
diff --git a/src/main/resources/de/deadlocker8/smarttime/fxml/MainGUI.fxml b/src/main/resources/de/deadlocker8/smarttime/fxml/MainGUI.fxml
index 45d75289fd76d776793a2fcacd5a93071959774d..f097e928611346985fdd62b3ade7b3a75468649b 100644
--- a/src/main/resources/de/deadlocker8/smarttime/fxml/MainGUI.fxml
+++ b/src/main/resources/de/deadlocker8/smarttime/fxml/MainGUI.fxml
@@ -16,7 +16,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.deadlocker8.smarttime.controller.Controller">
+<AnchorPane prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.251" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.deadlocker8.smarttime.controller.Controller">
    <children>
       <VBox alignment="TOP_CENTER" layoutX="143.0" layoutY="69.0" prefHeight="800.0" prefWidth="650.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>