diff --git a/Habitica/res/menu/guild_admin.xml b/Habitica/res/menu/guild_admin.xml
index 0969ef891..b3623ab55 100644
--- a/Habitica/res/menu/guild_admin.xml
+++ b/Habitica/res/menu/guild_admin.xml
@@ -5,8 +5,7 @@
     <item
         android:id="@+id/menu.guild.edit"
         android:orderInCategory="1"
-        app:showAsAction="ifRoom"
-        android:title="@string/action_edit"
-        abc:showAsAction="ifRoom"/>
+        app:showAsAction="never"
+        android:title="@string/action_edit" />
 
 </menu>
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java
index 78e5ae240..a9bcffd3d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java
@@ -91,9 +91,11 @@ public class GuildFragment extends BaseMainFragment implements Callback<Group> {
         switch (id) {
             case R.id.menu_guild_join:
                 this.mAPIHelper.apiService.joinGroup(this.guild.id, this);
+                this.isMember = true;
                 return true;
             case R.id.menu_guild_leave:
                 this.mAPIHelper.apiService.leaveGroup(this.guild.id, this);
+                this.isMember = false;
                 return true;
             case R.id.menu_guild_edit:
                 this.displayEditForm();
@@ -236,21 +238,17 @@ public class GuildFragment extends BaseMainFragment implements Callback<Group> {
 
     @Override
     public void success(Group group, Response response) {
-        if (group == null) {
-            this.tabLayout.removeAllTabs();
-            return;
-        }
-        this.guild = group;
+        if (group != null) {
+            if (this.guildInformationFragment != null) {
+                this.guildInformationFragment.setGroup(group);
+            }
 
-        if (this.guildInformationFragment != null) {
-            this.guildInformationFragment.setGroup(group);
-        }
+            if (this.chatListFragment != null) {
+                this.chatListFragment.seenGroupId = group.id;
+            }
 
-        if (this.chatListFragment != null) {
-            this.chatListFragment.seenGroupId = group.id;
+            this.guild = group;
         }
-
-        this.guild = group;
         this.activity.supportInvalidateOptionsMenu();
     }