diff --git a/source/Ox.UI/js/Core/Keyboard.js b/source/Ox.UI/js/Core/Keyboard.js
index 905d7c2b..4305ca1e 100644
--- a/source/Ox.UI/js/Core/Keyboard.js
+++ b/source/Ox.UI/js/Core/Keyboard.js
@@ -34,6 +34,7 @@ Ox.Keyboard = (function() {
         if (
             focused === null || (
                 !$focused.hasClass('OxInput')
+                && !$focused.hasClass('OxEditableContent')
                 && !$focused.hasClass('OxAutocompleteMenu')
             )
         ) {
@@ -54,6 +55,7 @@ Ox.Keyboard = (function() {
                     'backspace', 'down', 'left', 'right', 'space', 'up'
                 ].indexOf(key) > -1
                 && !$focused.hasClass('OxInput')
+                && !$focused.hasClass('OxEditableContent')
                 && !$focused.hasClass('OxAutocompleteMenu')
             ) {
                 ret = false;