diff --git a/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java b/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
index 9cc547c9f1c..9ce45aade2b 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/ShellOptionsJC.java
@@ -145,7 +145,7 @@ public String getPassword() {
   }
 
   public boolean isTabCompletionDisabled() {
-    return tabCompletionDisabled;
+    return execCommand != null || tabCompletionDisabled;
   }
 
   public boolean isHelpEnabled() {