diff --git a/webapp/components/Button/JoinLeaveButton.vue b/webapp/components/Button/JoinLeaveButton.vue
index 915406bd5..993631065 100644
--- a/webapp/components/Button/JoinLeaveButton.vue
+++ b/webapp/components/Button/JoinLeaveButton.vue
@@ -15,12 +15,13 @@
 </template>
 
 <script>
+import { mapMutations } from 'vuex'
 import { joinGroupMutation, leaveGroupMutation } from '~/graphql/groups'
 
 export default {
   name: 'JoinLeaveButton',
   props: {
-    groupId: { type: String, required: true },
+    group: { type: Object, required: true },
     userId: { type: String, required: true },
     isMember: { type: Boolean, required: true },
     disabled: { type: Boolean, default: false },
@@ -58,12 +59,54 @@ export default {
     },
   },
   methods: {
+    ...mapMutations({
+      commitModalData: 'modal/SET_OPEN',
+    }),
     onHover() {
       if (!this.disabled && !this.localLoading) {
         this.hovered = true
       }
     },
-    async toggle() {
+    toggle() {
+      if (this.isMember) {
+        this.openLeaveModal()
+      } else {
+        this.joinLeave()
+      }
+    },
+    openLeaveModal() {
+      this.commitModalData(this.leaveModalData())
+    },
+    leaveModalData() {
+      return {
+        name: 'confirm',
+        data: {
+          type: '',
+          resource: { id: '' },
+          modalData: {
+            titleIdent: 'group.leaveModal.title',
+            messageIdent: 'group.leaveModal.message',
+            messageParams: {
+              name: this.group.name,
+            },
+            buttons: {
+              confirm: {
+                danger: true,
+                icon: 'sign-out',
+                textIdent: 'group.leaveModal.confirmButton',
+                callback: this.joinLeave,
+              },
+              cancel: {
+                icon: 'close',
+                textIdent: 'actions.cancel',
+                callback: () => {},
+              },
+            },
+          },
+        },
+      }
+    },
+    async joinLeave() {
       const join = !this.isMember
       const mutation = join ? joinGroupMutation : leaveGroupMutation
 
@@ -73,7 +116,7 @@ export default {
       try {
         const { data } = await this.$apollo.mutate({
           mutation,
-          variables: { groupId: this.groupId, userId: this.userId },
+          variables: { groupId: this.group.id, userId: this.userId },
         })
         const joinedLeftGroupResult = join ? data.JoinGroup : data.LeaveGroup
         this.$emit('update', joinedLeftGroupResult)
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 035586934..7222b7c72 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -385,6 +385,11 @@
       "iAmMember": "Bin Mitglied",
       "join": "Beitreten"
     },
+    "leaveModal": {
+      "confirmButton": "Verlassen",
+      "message": "Eine Gruppe zu verlassen ist möglicherweise nicht rückgängig zu machen!<br>Gruppe <b>„{name}“</b> verlassen!",
+      "title": "Möchtest du wirklich die Gruppe verlassen?"
+    },
     "membersCount": "Mitglieder",
     "membersListTitle": "Gruppenmitglieder",
     "role": "Deine Rolle in der Gruppe",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index f2dc472db..1717eee5f 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -385,6 +385,11 @@
       "iAmMember": "I'm a member",
       "join": "Join"
     },
+    "leaveModal": {
+      "confirmButton": "Leave",
+      "message": "Leaving a group may be irreversible!<br>Leave group <b>“{name}”</b>!",
+      "title": "Do you really want to leave the group?"
+    },
     "membersCount": "Members",
     "membersListTitle": "Group Members",
     "role": "Your role in the group",
diff --git a/webapp/pages/group/_id/_slug.vue b/webapp/pages/group/_id/_slug.vue
index 85f8301fc..82f8f270e 100644
--- a/webapp/pages/group/_id/_slug.vue
+++ b/webapp/pages/group/_id/_slug.vue
@@ -91,7 +91,7 @@
               @update="updateFollow"
             /> -->
             <join-leave-button
-              :groupId="group && group.id ? group.id : ''"
+              :group="group || {}"
               :userId="currentUser.id"
               :isMember="isGroupMember"
               :disabled="isGroupOwner"