diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 47c6ab57ca..5ef627034c 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -469,7 +469,7 @@ export default React.createClass({
 
         if (group.myMembership === 'leave') {
             // Leave settings - the user might have clicked the "Leave" button
-            this._onCancelClick();
+            this._closeSettings();
         }
         this.setState({membershipBusy: false});
     },
@@ -567,6 +567,10 @@ export default React.createClass({
     },
 
     _onCancelClick: function() {
+        this._closeSettings();
+    },
+
+    _closeSettings() {
         this.setState({
             editing: false,
             profileForm: null,