diff --git a/web/source/osk/oskBaseKey.ts b/web/source/osk/oskBaseKey.ts
index 8ac6a65187..fc9b3ae70f 100644
--- a/web/source/osk/oskBaseKey.ts
+++ b/web/source/osk/oskBaseKey.ts
@@ -21,6 +21,10 @@ namespace com.keyman.osk {
       return this.spec.coreID;
     }
 
+    getBaseId(): string {
+      return this.spec.baseKeyID;
+    }
+
     // Produces a small reference label for the corresponding physical key on a US keyboard.
     private generateKeyCapLabel(): HTMLDivElement {
       // Create the default key cap labels (letter keys, etc.)
diff --git a/web/source/osk/oskLayer.ts b/web/source/osk/oskLayer.ts
index 843749ac43..0e9553baa6 100644
--- a/web/source/osk/oskLayer.ts
+++ b/web/source/osk/oskLayer.ts
@@ -76,10 +76,10 @@ namespace com.keyman.osk {
      *  @param    {string}  keyId   key identifier
      *  @return   {Object}          Reference to key
      */
-    public findKey(coreID: string): OSKBaseKey {
+    private findKey(keyId: string): OSKBaseKey {
       for(const row of this.rows) {
         for(const key of row.keys) {
-          if(key.getCoreId() == coreID) {
+          if(key.getBaseId() == keyId) {
             return key;
           }
         }