diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/listener/SyncTabCompleteListener.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/listener/SyncTabCompleteListener.java
index 323ac0db4..02ebe9a85 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/listener/SyncTabCompleteListener.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/listener/SyncTabCompleteListener.java
@@ -1,6 +1,8 @@
 package com.boydti.fawe.bukkit.listener;
 
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
+
+import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.server.TabCompleteEvent;
 
@@ -13,7 +15,7 @@ public class SyncTabCompleteListener extends ATabCompleteListener {
 
     @EventHandler
     public void onTabComplete(TabCompleteEvent event) {
-        if (event.isCommand()) {
+        if (event.getSender() instanceof ConsoleCommandSender || event.getBuffer().startsWith("/")) {
             List<String> result = this.onTab(event.getBuffer(), event.getSender());
             if (result != null) {
                 event.setCompletions(result);