diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/FallController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/FallController.java
index 8f78f14..7452d92 100644
--- a/src/main/java/de/uniluebeck/mi/projmi6/controller/FallController.java
+++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/FallController.java
@@ -113,19 +113,8 @@ public class FallController {
         fallFallart.setItems(FXCollections.observableArrayList(FallArt.values()));
         fallKasse.setItems(mainController.getStammdaten().getKassen());
 
-        btnFallEnableEdit.managedProperty().bind(
-                state.isEqualTo(State.VIEW).and(fallProperty.isNotNull())
-        );
-        btnFallAbort.managedProperty().bind(
-                state.isNotEqualTo(State.VIEW)
-        );
-        btnFallSave.managedProperty().bind(
-                state.isNotEqualTo(State.VIEW)
-        );
 
-        btnFallCancel.managedProperty().bind(
-                state.isEqualTo(State.VIEW).and(fallProperty.isNotNull())
-        );
+        initButtons();
 
         fallFields.disableProperty().bind(state.isEqualTo(State.VIEW));
 
@@ -145,6 +134,29 @@ public class FallController {
         });
     }
 
+    /**
+     * Hide the buttons depending on controller state.
+     */
+    private void initButtons(){
+        btnFallEnableEdit.managedProperty().bind(
+                state.isEqualTo(State.VIEW).and(fallProperty.isNotNull())
+        );
+        btnFallEnableEdit.visibleProperty().bind(btnFallEnableEdit.managedProperty());
+        btnFallAbort.managedProperty().bind(
+                state.isNotEqualTo(State.VIEW)
+        );
+        btnFallAbort.visibleProperty().bind(btnFallAbort.managedProperty());
+
+        btnFallSave.managedProperty().bind(
+                state.isNotEqualTo(State.VIEW)
+        );
+        btnFallSave.visibleProperty().bind(btnFallSave.managedProperty());
+
+        btnFallCancel.managedProperty().bind(
+                state.isEqualTo(State.VIEW).and(fallProperty.isNotNull())
+        );
+        btnFallCancel.visibleProperty().bind(btnFallCancel.managedProperty());
+    }
 
 
     public void editFall(){
diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java
index bc0d277..8a715b7 100644
--- a/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java
+++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java
@@ -321,6 +321,10 @@ public class MainController {
     }
 
 
+    public Fall getFall(){
+        return lvFall.getSelectionModel().getSelectedItem();
+    }
+
 public enum TabName {
     OVERVIEW, DIAGNOSE, UNTERSUCHUNG, STATIONSHISTORIE;
 }
diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/StationsHistorieController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/StationsHistorieController.java
index 8feb0b6..5d551e1 100644
--- a/src/main/java/de/uniluebeck/mi/projmi6/controller/StationsHistorieController.java
+++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/StationsHistorieController.java
@@ -246,6 +246,8 @@ public class StationsHistorieController {
         stationsHistorie.setAufnahmeDatum(dtTmAufnahme.getDateTime());
         stationsHistorie.setEntlassungsDatum(dtTmEntlassung.getDateTime());
         stationsHistorie.setStation(cmbStation.getValue());
+        stationsHistorie.setFallID(mainController.getFall().getFallID());
+        stationsHistorie.setStationKey(cmbStation.getValue().getStation());
     }
 
     private void clearFields(){