diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 22a2808eb6..1c93841afb 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -310,20 +310,7 @@ export default class AppTile extends React.Component {
         if (this.props.onEditClick) {
             this.props.onEditClick();
         } else {
-            // TODO: Open the right manager for the widget
-            if (SettingsStore.getValue("feature_many_integration_managers")) {
-                IntegrationManagers.sharedInstance().openAll(
-                    this.props.room,
-                    'type_' + this.props.app.type,
-                    this.props.app.id,
-                );
-            } else {
-                IntegrationManagers.sharedInstance().getPrimaryManager().open(
-                    this.props.room,
-                    'type_' + this.props.app.type,
-                    this.props.app.id,
-                );
-            }
+            WidgetUtils.editWidget(this.props.room, this.props.app);
         }
     }
 
diff --git a/src/settings/WatchManager.ts b/src/settings/WatchManager.ts
index d51439459c..ea2f158ef6 100644
--- a/src/settings/WatchManager.ts
+++ b/src/settings/WatchManager.ts
@@ -18,11 +18,10 @@ import { SettingLevel } from "./SettingLevel";
 
 export type CallbackFn = (changedInRoomId: string, atLevel: SettingLevel, newValAtLevel: any) => void;
 
-const IRRELEVANT_ROOM = Symbol("any room");
+const IRRELEVANT_ROOM: string = null;
 
 interface RoomWatcherMap {
-    // @ts-ignore - TS wants string-only keys but we know better - https://github.com/Microsoft/TypeScript/issues/1863
-    [roomId: string | symbol]: CallbackFn[];
+    [roomId: string]: CallbackFn[];
 }
 
 /**
@@ -69,7 +68,7 @@ export class WatchManager {
         if (!inRoomId) {
             // Fire updates to all the individual room watchers too, as they probably
             // care about the change higher up.
-            callbacks.push(...Object.values(roomWatchers).reduce((r, a) => [...r, ...a], []));
+            callbacks.push(...Object.values(roomWatchers).flat(1));
         } else if (roomWatchers[IRRELEVANT_ROOM]) {
             callbacks.push(...roomWatchers[IRRELEVANT_ROOM]);
         }
diff --git a/src/stores/WidgetEchoStore.js b/src/stores/WidgetEchoStore.js
index a5e7b12da0..7dd093d45e 100644
--- a/src/stores/WidgetEchoStore.js
+++ b/src/stores/WidgetEchoStore.js
@@ -93,13 +93,13 @@ class WidgetEchoStore extends EventEmitter {
         if (this._roomWidgetEcho[roomId] === undefined) this._roomWidgetEcho[roomId] = {};
 
         this._roomWidgetEcho[roomId][widgetId] = state;
-        this.emit('update');
+        this.emit('update', roomId, widgetId);
     }
 
     removeRoomWidgetEcho(roomId, widgetId) {
         delete this._roomWidgetEcho[roomId][widgetId];
         if (Object.keys(this._roomWidgetEcho[roomId]).length === 0) delete this._roomWidgetEcho[roomId];
-        this.emit('update');
+        this.emit('update', roomId, widgetId);
     }
 }
 
diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js
index d5f6981476..be176d042f 100644
--- a/src/utils/WidgetUtils.js
+++ b/src/utils/WidgetUtils.js
@@ -405,6 +405,7 @@ export default class WidgetUtils {
         app.creatorUserId = senderUserId;
 
         app.id = appId;
+        app.roomId = roomId;
         app.eventId = eventId;
         app.name = app.name || app.type;
 
@@ -476,4 +477,13 @@ export default class WidgetUtils {
         const url = new URL("jitsi.html#" + queryString, baseUrl); // this strips hash fragment from baseUrl
         return url.href;
     }
+
+    static editWidget(room, app) {
+        // TODO: Open the right manager for the widget
+        if (SettingsStore.getValue("feature_many_integration_managers")) {
+            IntegrationManagers.sharedInstance().openAll(room, 'type_' + app.type, app.id);
+        } else {
+            IntegrationManagers.sharedInstance().getPrimaryManager().open(room, 'type_' + app.type, app.id);
+        }
+    }
 }