diff --git a/src/components/structures/BottomLeftMenu.js b/src/components/structures/BottomLeftMenu.js
index 6858a47d..178fe940 100644
--- a/src/components/structures/BottomLeftMenu.js
+++ b/src/components/structures/BottomLeftMenu.js
@@ -76,10 +76,10 @@ module.exports = React.createClass({
     },
 
     // Get the label/tooltip to show
-    getLabel: function(label, parent, show) {
+    getLabel: function(label, show) {
         if (show) {
             var RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
-            return <RoomTooltip label={label} parent={parent} left={6} top={this.props.collapsed ? 3 : null} />;
+            return <RoomTooltip label={label} left={6} top={this.props.collapsed ? 3 : null} />;
         }
     },
 
@@ -88,17 +88,17 @@ module.exports = React.createClass({
         return (
             <div className="mx_BottomLeftMenu">
                 <div className="mx_BottomLeftMenu_options">
-                    <div className="mx_BottomLeftMenu_createRoom" onClick={ this.onRoomsClick } onMouseEnter={ this.onRoomsMouseEnter } onMouseLeave={ this.onRoomsMouseLeave } ref={(ref) => this._rooms = ref} >
+                    <div className="mx_BottomLeftMenu_createRoom" onClick={ this.onRoomsClick } onMouseEnter={ this.onRoomsMouseEnter } onMouseLeave={ this.onRoomsMouseLeave } >
                         <TintableSvg src="img/icons-create-room.svg" width="25" height="25" />
-                        { this.getLabel("Rooms", this._rooms, this.state.roomsHover) }
+                        { this.getLabel("Rooms", this.state.roomsHover) }
                     </div>
-                    <div className="mx_BottomLeftMenu_people" onClick={ this.onPeopleClick } onMouseEnter={ this.onPeopleMouseEnter } onMouseLeave={ this.onPeopleMouseLeave } ref={(ref) => this._people = ref} >
+                    <div className="mx_BottomLeftMenu_people" onClick={ this.onPeopleClick } onMouseEnter={ this.onPeopleMouseEnter } onMouseLeave={ this.onPeopleMouseLeave } >
                         <TintableSvg src="img/icons-people.svg" width="25" height="25" />
-                        { this.getLabel("New direct message", this._people, this.state.peopleHover) }
+                        { this.getLabel("New direct message", this.state.peopleHover) }
                     </div>
-                    <div className="mx_BottomLeftMenu_settings" onClick={ this.onSettingsClick } onMouseEnter={ this.onSettingsMouseEnter } onMouseLeave={ this.onSettingsMouseLeave } ref={(ref) => this._settings = ref} >
+                    <div className="mx_BottomLeftMenu_settings" onClick={ this.onSettingsClick } onMouseEnter={ this.onSettingsMouseEnter } onMouseLeave={ this.onSettingsMouseLeave } >
                         <TintableSvg src="img/icons-settings.svg" width="25" height="25" />
-                        { this.getLabel("Settings", this._settings, this.state.settingsHover) }
+                        { this.getLabel("Settings", this.state.settingsHover) }
                     </div>
                 </div>
             </div>
diff --git a/src/components/views/rooms/RoomTooltip.js b/src/components/views/rooms/RoomTooltip.js
index e2cdd8a2..ce0b0f61 100644
--- a/src/components/views/rooms/RoomTooltip.js
+++ b/src/components/views/rooms/RoomTooltip.js
@@ -25,9 +25,6 @@ module.exports = React.createClass({
     displayName: 'RoomTooltip',
 
     propTypes: {
-        // The 'parent' can either be a React component or a DOM element
-        parent: React.PropTypes.object.isRequired,
-
         // The tooltip is derived from either the room name or a label
         room: React.PropTypes.object,
         label: React.PropTypes.string,
@@ -83,19 +80,11 @@ module.exports = React.createClass({
         if (this.props.left) { style.left = this.props.left; }
         if (this.props.right) { style.right = this.props.right; }
 
-        var parent;
-        if (this._isDOMElement(this.props.parent)) {
-            parent = this.props.parent;
-        } else if (this._isReactComponent(this.props.parent)) {
-            parent = ReactDOM.findDOMNode(this.props.parent);
-        } else {
-            parent = null;
-        }
-
         // If a parent exists, add the parent's position to the tooltips, so it's correctly
         // positioned, also taking into account any window zoom
         // NOTE: The additional 6 pixels for the left position, is to take account of the
         // tooltips chevron
+        var parent = ReactDOM.findDOMNode(this).parentElement;
         if (parent) {
             style.top = (+style.top || 0) + parent.getBoundingClientRect().top + window.pageYOffset;
             style.left = (+style.left || 0) + 6 + parent.getBoundingClientRect().right + window.pageXOffset;