diff --git a/grid/ObjectGrid.js b/grid/ObjectGrid.js
index 68937ce..36c873c 100644
--- a/grid/ObjectGrid.js
+++ b/grid/ObjectGrid.js
@@ -225,10 +225,17 @@ Ext.define('Proxmox.grid.ObjectGrid', {
     },
 
     listeners: {
-	itemkeyup: function(view, record, item, index, e) {
+	itemkeydown: function(view, record, item, index, e) {
 	    if (e.getKey() === e.ENTER) {
+		this.pressedIndex = index;
+	    }
+	},
+	itemkeyup: function(view, record, item, index, e) {
+	    if (e.getKey() === e.ENTER && index == this.pressedIndex) {
 		this.run_editor();
 	    }
+
+	    this.pressedIndex = undefined;
 	}
     },