diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 4b8ac70336..91fa378f33 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -467,6 +467,10 @@ export default React.createClass({
     _onGroupMyMembership: function(group) {
         if (group.groupId !== this.props.groupId) return;
 
+        if (group.myMembership === 'leave') {
+            // Leave settings - the user might have clicked the "Leave" button
+            this._onCancelClick();
+        }
         this.setState({membershipBusy: false});
     },