diff --git a/src/de/steamwar/command/AbstractSWCommand.java b/src/de/steamwar/command/AbstractSWCommand.java
index 6441d65..65f6643 100644
--- a/src/de/steamwar/command/AbstractSWCommand.java
+++ b/src/de/steamwar/command/AbstractSWCommand.java
@@ -31,6 +31,7 @@ import java.util.function.BiPredicate;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public abstract class AbstractSWCommand<T> {
 
@@ -102,7 +103,7 @@ public abstract class AbstractSWCommand<T> {
     protected final List<String> tabComplete(T sender, String alias, String[] args) throws IllegalArgumentException {
         initialize();
         String string = args[args.length - 1].toLowerCase();
-        return commandList.stream()
+        return Stream.concat(commandList.stream(), helpCommandList.stream())
                 .filter(s -> !s.noTabComplete)
                 .map(s -> s.tabComplete(sender, args))
                 .filter(Objects::nonNull)