5 files changed, 21 insertions, 0 deletions
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index e1779ec92..f2acaea56 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -940,6 +940,18 @@ impHandler0(leaveParty)
     return false;
 }
 
+impHandler0(leaveGuild)
+{
+    if (guildHandler && localPlayer)
+    {
+        const Guild *const guild = localPlayer->getGuild();
+        if (guild)
+            guildHandler->leave(guild->getId());
+        return true;
+    }
+    return false;
+}
+
 impHandler(warp)
 {
     int x = 0;
diff --git a/src/actions/commands.h b/src/actions/commands.h
index ff17da2d3..acc13af75 100644
--- a/src/actions/commands.h
+++ b/src/actions/commands.h
@@ -79,6 +79,7 @@ namespace Actions
     decHandler(setHomunculusName);
     decHandler(fireHomunculus);
     decHandler(leaveParty);
+    decHandler(leaveGuild);
     decHandler(warp);
     decHandler(homunTalk);
     decHandler(homunEmote);
diff --git a/src/dyetool/actions/commands.cpp b/src/dyetool/actions/commands.cpp
index 45daa68d4..68331913d 100644
--- a/src/dyetool/actions/commands.cpp
+++ b/src/dyetool/actions/commands.cpp
@@ -79,6 +79,7 @@ impHandlerVoid(serverUnIgnoreWhisper)
 impHandlerVoid(setHomunculusName)
 impHandlerVoid(fireHomunculus)
 impHandlerVoid(leaveParty)
+impHandlerVoid(leaveGuild)
 impHandlerVoid(warp)
 impHandlerVoid(homunTalk)
 impHandlerVoid(homunEmote)
diff --git a/src/enums/input/inputaction.h b/src/enums/input/inputaction.h
index 4f7b61986..27b0974f9 100644
--- a/src/enums/input/inputaction.h
+++ b/src/enums/input/inputaction.h
@@ -679,6 +679,7 @@ enumStart(InputAction)
     SHOW_SKILL_OFFSET_Y,
     SET_SKILL_OFFSET_X,
     SET_SKILL_OFFSET_Y,
+    LEAVE_GUILD,
     TOTAL
 }
 enumEnd(InputAction);
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index ed8cddb92..bff086cd3 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -5564,6 +5564,12 @@ static const InputActionData inputActionData
         "setskilloffsety",
         UseArgs_true,
         Protected_true},
+    {"keyLeaveGuild",
+        defaultAction(&Actions::leaveGuild),
+        InputCondition::INGAME,
+        "leaveguild|guildleave",
+        UseArgs_false,
+        Protected_true},
 };
 
 #undef defaultAction