diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index d14d439d66..cb6e79f5e6 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -338,6 +338,12 @@ function setWidget(event, roomId) {
         sendResponse(event, {
             success: true,
         });
+
+        if (widgetUrl !== null) {
+            client.sendTextMessage(roomId, `Added ${widgetType} widget - ${widgetUrl}`);
+        } else {
+            client.sendTextMessage(roomId, `Removed ${widgetType} widget`);
+        }
     }, (err) => {
         sendError(event, _t('Failed to send request.'), err);
     });
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 66b0eab3e7..f26aa29d31 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -121,7 +121,9 @@ module.exports = React.createClass({
                     this.scalarClient.getScalarInterfaceUrlForRoom(this.props.room.roomId) :
                     null,
             onFinished: ()=>{
-                this.props.onCancelClick(ev);
+                if (this.props.onCancelClick) {
+                    this.props.onCancelClick(ev);
+                }
             },
         }, "mx_IntegrationsManager");
     },