diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 8445da343a..fa74180a2c 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -238,7 +238,7 @@ const RoomSubList = React.createClass({
                 <AccessibleTooltipButton
                     onClick={ this.props.onAddRoom }
                     className="mx_RoomSubList_addRoom"
-                    tooltip={this.props.addRoomLabel || _t("Add room")}
+                    title={this.props.addRoomLabel || _t("Add room")}
                 />
             );
         }
diff --git a/src/components/views/elements/AccessibleTooltipButton.js b/src/components/views/elements/AccessibleTooltipButton.js
index 0b632417d6..6f7913a3cd 100644
--- a/src/components/views/elements/AccessibleTooltipButton.js
+++ b/src/components/views/elements/AccessibleTooltipButton.js
@@ -24,7 +24,8 @@ import sdk from "../../../index";
 export default class AccessibleTooltipButton extends React.PureComponent {
     static propTypes = {
         ...AccessibleButton.propTypes,
-        tooltip: PropTypes.string.isRequired,
+        // The tooltip to render on hover
+        title: PropTypes.string.isRequired,
     };
 
     state = {
@@ -47,12 +48,12 @@ export default class AccessibleTooltipButton extends React.PureComponent {
         const Tooltip = sdk.getComponent("elements.Tooltip");
         const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
 
-        const {tooltip, ...props} = this.props;
+        const {title, ...props} = this.props;
 
         const tip = this.state.hover ? <Tooltip
             className="mx_AccessibleTooltipButton_container"
             tooltipClassName="mx_AccessibleTooltipButton_tooltip"
-            label={tooltip}
+            label={title}
         /> : <div />;
         return (
             <AccessibleButton {...props} onMouseOver={this.onMouseOver} onMouseOut={this.onMouseOut}>