4 files changed, 20 insertions, 0 deletions
diff --git a/src/gui/widgets/tabs/guildchattab.cpp b/src/gui/widgets/tabs/guildchattab.cpp
index 8de95991f..13386d18f 100644
--- a/src/gui/widgets/tabs/guildchattab.cpp
+++ b/src/gui/widgets/tabs/guildchattab.cpp
@@ -128,6 +128,14 @@ void GuildChatTab::getAutoCompleteList(StringVect &names) const
         return;
 
     guildManager->getNames(names);
+}
+
+void GuildChatTab::getAutoCompleteCommands(StringVect &names) const
+{
+    names.push_back("/help");
+    names.push_back("/invite ");
+    names.push_back("/leave");
+    names.push_back("/kick ");
     names.push_back("/notice ");
 }
 
diff --git a/src/gui/widgets/tabs/guildchattab.h b/src/gui/widgets/tabs/guildchattab.h
index 7fac06843..d0d70778d 100644
--- a/src/gui/widgets/tabs/guildchattab.h
+++ b/src/gui/widgets/tabs/guildchattab.h
@@ -55,6 +55,8 @@ class GuildChatTab final : public ChatTab, public ConfigListener
         void handleInput(const std::string &msg) override final;
 
         void getAutoCompleteList(StringVect &names) const override final;
+
+        void getAutoCompleteCommands(StringVect &names) const override final;
 };
 
 #endif  // GUI_WIDGETS_TABS_GUILDCHATTAB_H
diff --git a/src/net/ea/gui/guildtab.cpp b/src/net/ea/gui/guildtab.cpp
index 5a8c78c60..889b9624b 100644
--- a/src/net/ea/gui/guildtab.cpp
+++ b/src/net/ea/gui/guildtab.cpp
@@ -147,7 +147,15 @@ void GuildTab::getAutoCompleteList(StringVect &names) const
 {
     if (taGuild)
         taGuild->getNames(names);
+}
+
+void GuildTab::getAutoCompleteCommands(StringVect &names) const
+{
+    names.push_back("/help");
+    names.push_back("/invite ");
+    names.push_back("/kick ");
     names.push_back("/notice ");
+    names.push_back("/leave");
 }
 
 void GuildTab::saveToLogFile(const std::string &msg) const
diff --git a/src/net/ea/gui/guildtab.h b/src/net/ea/gui/guildtab.h
index 442ad62d0..8ee4f62e4 100644
--- a/src/net/ea/gui/guildtab.h
+++ b/src/net/ea/gui/guildtab.h
@@ -58,6 +58,8 @@ class GuildTab : public ChatTab, public ConfigListener
         void handleInput(const std::string &msg) override final;
 
         void getAutoCompleteList(StringVect &names) const override final;
+
+        void getAutoCompleteCommands(StringVect &names) const override final;
 };
 
 }  // namespace Ea