diff --git a/src/main/java/at/ionas999/adressbook/controller/AddressBookController.java b/src/main/java/at/ionas999/adressbook/controller/AddressBookController.java
index 88910df..dca34e5 100644
--- a/src/main/java/at/ionas999/adressbook/controller/AddressBookController.java
+++ b/src/main/java/at/ionas999/adressbook/controller/AddressBookController.java
@@ -24,12 +24,23 @@ public class AddressBookController {
     private final ObservableList<Contact> contacts = FXCollections.observableArrayList();
     private final FilteredList<Contact> filteredContacts = new FilteredList<>(contacts);
 
-    public void initialize() {
-        contactView.setItems(filteredContacts);
+public void initialize() {
+    contactView.setItems(filteredContacts);
 
-        contacts.addListener((ListChangeListener<? super Contact>) (observable) -> updateContactCount());
-        updateContactCount();
-    }
+    contacts.addListener((ListChangeListener<? super Contact>) (observable) -> updateContactCount());
+    updateContactCount();
+
+    contactView.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
+        if (newValue != null) {
+            idField.setText(String.valueOf(newValue.getId()));
+            nameField.setText(newValue.getName());
+            phoneField.setText(newValue.getPhone());
+            emailField.setText(newValue.getEmail());
+        } else {
+            clearInputFields();
+        }
+    });
+}
 
     private Predicate<Contact> createFilterPredicate(String searchText) {
         if (searchText == null || searchText.isBlank()) {