diff --git a/tools/cldr-apps/js/src/esm/cldrMenu.mjs b/tools/cldr-apps/js/src/esm/cldrMenu.mjs
index b86ea10349d..b5bc3b304a6 100644
--- a/tools/cldr-apps/js/src/esm/cldrMenu.mjs
+++ b/tools/cldr-apps/js/src/esm/cldrMenu.mjs
@@ -418,6 +418,16 @@ function updateLocaleMenu() {
   const curLocale = cldrStatus.getCurrentLocale();
   let prefixMessage = "";
   if (curLocale != null && curLocale != "" && curLocale != "-") {
+    // here, update keyboards
+
+    for (const { InternalName } of keyman.getKeyboards()) {
+      keyman.removeKeyboards(InternalName);
+      console.log(`Removed kbd: ${InternalName}`);
+    }
+    console.log(`Adding kbd: @${curLocale}`);
+    keyman.addKeyboards(`@${curLocale}`);
+    // end keyboards
+
     const locmap = cldrLoad.getTheLocaleMap();
     cldrStatus.setCurrentLocaleName(locmap.getLocaleName(curLocale));
     var bund = locmap.getLocaleInfo(curLocale);
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyTool.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyTool.java
index bf3ee340b87..431760ba75b 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyTool.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyTool.java
@@ -237,6 +237,15 @@ public static void includeJavaScript(HttpServletRequest request, Writer out)
                         + ".js\"></script>\n");
         includeJqueryJavaScript(request, out);
         includeCldrJavaScript(request, out);
+
+        out.write(
+                "<script src='https://s.keyman.com/kmw/engine/16.0.141/keymanweb.js'></script>\n");
+        out.write(
+                "<script src='https://s.keyman.com/kmw/engine/16.0.141/kmwuitoggle.js'></script>\n");
+        out.write(
+                "<script>(function(kmw) {"
+                        + "kmw.init({attachType:'auto'});\n"
+                        + "})(keyman);</script>\n");
     }
 
     private static void includeJqueryJavaScript(HttpServletRequest request, Writer out)