diff --git a/interface/resources/html/raiseAndLowerKeyboard.js b/interface/resources/html/raiseAndLowerKeyboard.js
index aeca4dc112..fb53fcf743 100644
--- a/interface/resources/html/raiseAndLowerKeyboard.js
+++ b/interface/resources/html/raiseAndLowerKeyboard.js
@@ -40,13 +40,13 @@
 
         if (keyboardRaised !== isKeyboardRaised || numericKeyboard !== isNumericKeyboard) {
 
-            if (typeof EventBridge !== "undefined") {
+            if (typeof EventBridge !== "undefined" && EventBridge !== null) {
                 EventBridge.emitWebEvent(
                     keyboardRaised ? ("_RAISE_KEYBOARD" + (numericKeyboard ? "_NUMERIC" : "")) : "_LOWER_KEYBOARD"
                 );
             } else {
                 if (numWarnings < MAX_WARNINGS) {
-                    console.log("WARNING: no global EventBridge object found");
+                    console.log("WARNING: No global EventBridge object found");
                     numWarnings++;
                 }
             }
diff --git a/interface/resources/qml/dialogs/preferences/AvatarPreference.qml b/interface/resources/qml/dialogs/preferences/AvatarPreference.qml
index 8f05ca4ffe..0c5c5bf630 100644
--- a/interface/resources/qml/dialogs/preferences/AvatarPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/AvatarPreference.qml
@@ -74,11 +74,6 @@ Preference {
             colorScheme: hifi.colorSchemes.dark
         }
 
-        Component {
-            id: avatarBrowserBuilder;
-            AvatarBrowser { }
-        }
-
         Button {
             id: button
             text: "Browse"
@@ -87,12 +82,12 @@ Preference {
                 verticalCenter: dataTextField.verticalCenter
             }
             onClicked: {
-                root.browser = avatarBrowserBuilder.createObject(desktop);
+                // Load dialog via OffscreenUi so that JavaScript EventBridge is available.
+                root.browser = OffscreenUi.load("dialogs/preferences/AvatarBrowser.qml");
                 root.browser.windowDestroyed.connect(function(){
                     root.browser = null;
-                })
+                });
             }
         }
-
     }
 }