diff --git a/web/source/osk/visualKeyboard.ts b/web/source/osk/visualKeyboard.ts
index 6207d3a938..1f0fb64a83 100644
--- a/web/source/osk/visualKeyboard.ts
+++ b/web/source/osk/visualKeyboard.ts
@@ -1593,13 +1593,13 @@ namespace com.keyman.osk {
         t = <HTMLElement> t.parentNode;
       }
 
-      let key = getKeyFrom(t);
+      let key = this.keyTarget(t);
 
       if(util.eventType(e) == 'mousedown') {
         this.currentKey=key.id;
         util._CancelMouse(e);
         this.highlightKey(key, true);
-      } else if(t.id == this.currentKey) {
+      } else if(key.id == this.currentKey) {
         this.highlightKey(key, true);
       }
     }.bind(this);
@@ -1622,13 +1622,13 @@ namespace com.keyman.osk {
         t = <HTMLElement> t.parentNode;
       }
 
-      let key = getKeyFrom(t);
+      let key = this.keyTarget(t);
       this.highlightKey(key, false);
 
       // Process as click if mouse button released anywhere over key
       if(util.eventType(e) == 'mouseup') {
         if(key.id == this.currentKey) {
-          keyman.textProcessor.clickKey(getKeyFrom(key));
+          keyman.textProcessor.clickKey(key);
         }
         this.currentKey='';
       }
diff --git a/web/source/text/processor.ts b/web/source/text/processor.ts
index 1522b91329..1ab9f19fe5 100644
--- a/web/source/text/processor.ts
+++ b/web/source/text/processor.ts
@@ -367,7 +367,7 @@ namespace com.keyman.text {
       }
 
 
-      if(!fromOSK && !window.event) {
+      if(!keyman.isEmbedded && !fromOSK && !window.event) {
         // I1466 - Convert the - keycode on mnemonic as well as positional layouts
         // FireFox, Mozilla Suite
         if(keyMapManager.browserMap.FF['k'+keyEvent.Lcode]) {