4 files changed, 14 insertions, 0 deletions
diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp
index 3091bb108..cacafea5b 100644
--- a/src/actions/chat.cpp
+++ b/src/actions/chat.cpp
@@ -513,4 +513,11 @@ impHandler0(chatPartyTab)
     return true;
 }
 
+impHandler0(chatGuildTab)
+{
+    if (chatWindow)
+        chatWindow->selectTabByType(ChatTabType::GUILD);
+    return true;
+}
+
 }  // namespace Actions
diff --git a/src/actions/chat.h b/src/actions/chat.h
index b8e0cd5b3..1aa1778ef 100644
--- a/src/actions/chat.h
+++ b/src/actions/chat.h
@@ -56,6 +56,7 @@ namespace Actions
     decHandler(chatLangTab);
     decHandler(chatGmTab);
     decHandler(chatPartyTab);
+    decHandler(chatGuildTab);
 }  // namespace Actions
 
 #undef decHandler
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index b027ff0e2..694647a93 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -533,6 +533,7 @@ namespace InputAction
         CHAT_LANG_TAB,
         CHAT_GM_TAB,
         CHAT_PARTY_TAB,
+        CHAT_GUILD_TAB,
         TOTAL
     };
 }  // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index a46fb72e4..2235daba4 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -3959,6 +3959,11 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
         InputCondition::INGAME,
         "partytab|partychattab",
         false},
+    {"keyGuildTab",
+        defaultAction(&Actions::chatGuildTab),
+        InputCondition::INGAME,
+        "guildtab|guildchattab",
+        false},
 };
 
 #undef defaultAction