diff --git a/src/org/hwo/models/TableMapper/TableMapper.java b/src/org/hwo/models/TableMapper/TableMapper.java
index c291688..40d8fbb 100644
--- a/src/org/hwo/models/TableMapper/TableMapper.java
+++ b/src/org/hwo/models/TableMapper/TableMapper.java
@@ -1,5 +1,6 @@
 package org.hwo.models.TableMapper;
 
+import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
@@ -19,6 +20,9 @@ import javax.swing.table.AbstractTableModel;
 
 import org.hwo.csv.CSV;
 import org.hwo.interactiveobjects.InteractiveObjectHelper;
+import org.hwo.ui.KeyStrokeHelper;
+import org.hwo.ui.KeyStrokeListener;
+import org.hwo.ui.KeyStrokeParameters;
 
 public class TableMapper extends AbstractTableModel
 {
@@ -223,6 +227,8 @@ public class TableMapper extends AbstractTableModel
 	
 	private LinkedList<TableMapperListener> tableMapperListeners;
 	
+	private KeyStrokeHelper	keyStrokeHelper;
+	
 	public TableMapper(Class<?> clazz,JTable table)
 	{
 		this.tableMapperListeners = new LinkedList<TableMapperListener>();
@@ -235,6 +241,21 @@ public class TableMapper extends AbstractTableModel
 		this.p_columns = new ArrayList<TableMapper.ColumnInfo>();
 		this.p_readonly = false;
 		
+		this.keyStrokeHelper = new KeyStrokeHelper(jTable);
+		this.keyStrokeHelper.registerKeyStrokeListener(new KeyStrokeListener() {
+			
+			@Override
+			public void keyStroke(KeyStrokeParameters parameters) {
+				switch (parameters.getKeyCode())
+				{
+				case KeyEvent.VK_ENTER:
+					openEditor();
+					break;
+				}
+			}
+		});
+		this.keyStrokeHelper.addKeyCode(KeyEvent.VK_ENTER);
+		
 		initializeMapper();
 		initializeColumnInfo();