diff --git a/HISTORY.md b/HISTORY.md
index b0cb67b..f76ed51 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -7,6 +7,8 @@ https://github.com/josdejong/jsoneditor
 
 - Fixed #285: an issue with the enum drop down when having defined multiple
   enums in a JSON schema.
+- Fixed a (harmless) error in the console when clicking right from an enum
+  drop down.
 
 
 ## 2016-05-22, version 5.5.3
diff --git a/src/js/Node.js b/src/js/Node.js
index 72eb076..e0f2d32 100644
--- a/src/js/Node.js
+++ b/src/js/Node.js
@@ -2346,7 +2346,7 @@ Node.prototype.onEvent = function (event) {
       }
     }
     else {
-      if (domValue) {
+      if (domValue && !this.enum) {
         util.setEndOfContentEditable(domValue);
         domValue.focus();
       }