diff --git a/webgui/topics/Simulator/Properties.js b/webgui/topics/Simulator/Properties.js
index 19f68e240..1e8851b7e 100644
--- a/webgui/topics/Simulator/Properties.js
+++ b/webgui/topics/Simulator/Properties.js
@@ -85,11 +85,11 @@ define([
             }
 
             inplaceEditor.on('keyup', function(evt) {
-                switch (evt.key) {
-                case 'Esc':
+                switch (evt.keyCode) {
+                case 27:
                     endEdit();
                     break;
-                case 'Enter':
+                case 13:
                     endEdit(inplaceEditor.val());
                     break;
                 }