diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 07c5a680c6..fa932b6757 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -233,9 +233,11 @@ module.exports = React.createClass({
                         })}
                     </div>
 
-                    <div className="mx_UserSettings_avatarPicker" onClick={ this.onAvatarPickerClick } >
-                        <ChangeAvatar ref="changeAvatar" initialAvatarUrl={avatarUrl}
-                            showUploadSection={false} className="mx_UserSettings_avatarPicker_img"/>
+                    <div className="mx_UserSettings_avatarPicker">
+                        <div onClick={ this.onAvatarPickerClick }>
+                            <ChangeAvatar ref="changeAvatar" initialAvatarUrl={avatarUrl}
+                                showUploadSection={false} className="mx_UserSettings_avatarPicker_img"/>
+                        </div>
                         <div className="mx_UserSettings_avatarPicker_edit">
                             <label htmlFor="avatarInput" ref="file_label">
                                 <img src="img/camera.svg"
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 606603d451..21a030e7f2 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -245,8 +245,10 @@ module.exports = React.createClass({
             if (this.props.room) {
                 if (can_set_room_avatar) {
                     roomAvatar = (
-                        <div className="mx_RoomHeader_avatarPicker" onClick={ this.onAvatarPickerClick }>
-                            <ChangeAvatar ref="changeAvatar" room={this.props.room} showUploadSection={false} width={48} height={48} />
+                        <div className="mx_RoomHeader_avatarPicker">
+                            <div onClick={ this.onAvatarPickerClick }>
+                                <ChangeAvatar ref="changeAvatar" room={this.props.room} showUploadSection={false} width={48} height={48} />
+                            </div>
                             <div className="mx_RoomHeader_avatarPicker_edit">
                                 <label htmlFor="avatarInput" ref="file_label">
                                     <img src="img/camera.svg"