diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 60df6ade9b..1da344227e 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -41,7 +41,6 @@ export default class AppTile extends React.Component {
 
     constructor(props) {
         super(props);
-        console.warn('AppTile constructor', props);
         this.state = this._getNewState(props);
 
         this._onAction = this._onAction.bind(this);
@@ -218,8 +217,12 @@ export default class AppTile extends React.Component {
     }
 
     componentWillUnmount() {
-        this.widgetMessaging.stopListening();
-        this.widgetMessaging.removeEndpoint(this.props.id, this.props.url);
+        try {
+            this.widgetMessaging.stopListening();
+            this.widgetMessaging.removeEndpoint(this.props.id, this.props.url);
+        } catch (e) {
+            console.error('Failed to stop listening for widgetMessaging events', e.message);
+        }
         dis.unregister(this._onAction);
         window.removeEventListener('message', this._onMessage);
     }
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 39c51ebe3a..f87ac02d05 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -354,6 +354,7 @@ export default class MessageComposer extends React.Component {
             isOpen={this.state.showStickers}
             position={'top'}
             padding={1}
+            key='stickersPopover'
             content={({ position, targetRect, popoverRect }) => (
                 <ArrowContainer
                     position={position}