diff --git a/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/ZipEntryPicker.java b/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/ZipEntryPicker.java
index 7eaae9c3d972245aee6ac1bc274b334825d3e078..f305460d31536bfbd92e7f28f4ad93cdb6bda3c8 100644
--- a/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/ZipEntryPicker.java
+++ b/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/ZipEntryPicker.java
@@ -96,8 +96,15 @@ public class ZipEntryPicker {
         entryList.getSelectionModel().selectedItemProperty().addListener((obs, oldI, newI) -> {
             if (newI != null) {
                 showMetadata(newI.getEntry());
+                // Disable loadBtn when entry is erroneous
+                loadBtn.setDisable(newI.getEntry().getErrorType() != null);
             }
         });
+        cancelBtn.setOnAction(e -> stage.close());
+        loadBtn.setOnAction(e -> {
+            CityGmlZipEntry entry = entryList.getSelectionModel().getSelectedItem().getEntry();
+
+        });
     }
 
     public void initialize() {