diff --git a/PL2/PL2-gui/src/main/java/nl/tudelft/pl2016gr2/gui/view/MetadataSearchPaneController.java b/PL2/PL2-gui/src/main/java/nl/tudelft/pl2016gr2/gui/view/MetadataSearchPaneController.java
index 38c5b18b..c39bf048 100644
--- a/PL2/PL2-gui/src/main/java/nl/tudelft/pl2016gr2/gui/view/MetadataSearchPaneController.java
+++ b/PL2/PL2-gui/src/main/java/nl/tudelft/pl2016gr2/gui/view/MetadataSearchPaneController.java
@@ -22,6 +22,7 @@
 import javafx.scene.control.TextField;
 import javafx.scene.input.ClipboardContent;
 import javafx.scene.input.Dragboard;
+import javafx.scene.input.KeyCode;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.input.TransferMode;
 import javafx.scene.layout.Background;
@@ -221,6 +222,11 @@ private void updateTable() {
   }
 
   private void initializeGoTo() {
+    goToField.setOnKeyPressed(event -> {
+      if (event.getCode() == KeyCode.ENTER) {
+        goToButton.fire();
+      }
+    });
     goToButton.setOnAction(actionEvent -> {
       String fieldText = goToField.getText();
       if (fieldText.matches("\\d+")) {