diff --git a/org/wheel/gui/Wheel.form b/org/wheel/gui/Wheel.form
index 2ef04b6..9c075f5 100644
--- a/org/wheel/gui/Wheel.form
+++ b/org/wheel/gui/Wheel.form
@@ -166,6 +166,9 @@
           </Events>
         </Component>
         <Component class="javax.swing.JTextField" name="searchFieldText">
+          <Events>
+            <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="searchFieldTextKeyPressed"/>
+          </Events>
         </Component>
         <Component class="javax.swing.JButton" name="resetButton">
           <Properties>
diff --git a/org/wheel/gui/Wheel.java b/org/wheel/gui/Wheel.java
index 190041e..77a258b 100644
--- a/org/wheel/gui/Wheel.java
+++ b/org/wheel/gui/Wheel.java
@@ -169,6 +169,12 @@ public class Wheel extends javax.swing.JFrame {
             }
         });
 
+        searchFieldText.addKeyListener(new java.awt.event.KeyAdapter() {
+            public void keyPressed(java.awt.event.KeyEvent evt) {
+                searchFieldTextKeyPressed(evt);
+            }
+        });
+
         resetButton.setText("Reset");
         resetButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -374,6 +380,14 @@ public class Wheel extends javax.swing.JFrame {
         br.setVisible(true);
     }//GEN-LAST:event_dbManagementButtonActionPerformed
 
+    private void searchFieldTextKeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_searchFieldTextKeyPressed
+        if (evt.getKeyCode()==KeyEvent.VK_ENTER){
+            if(searchFieldText.getText().length() > 0){
+                simpleSearchFor(searchFieldText.getText());
+            }
+        }
+    }//GEN-LAST:event_searchFieldTextKeyPressed
+
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton addButton;