diff --git a/command.go b/command.go
index edddc14..2a275d7 100644
--- a/command.go
+++ b/command.go
@@ -37,7 +37,7 @@ func (c *Command) Name() string {
 }
 
 func (c *Command) Runnable() bool {
-	return c.Run != nil
+	return c.Run != nil && c.Disabled != true
 }
 
 func (c *Command) List() bool {
diff --git a/main.go b/main.go
index 89b3014..2d21af4 100644
--- a/main.go
+++ b/main.go
@@ -23,10 +23,7 @@ func main() {
 	}
 
 	for _, cmd := range commands {
-		if cmd.Disabled == true {
-			continue
-		}
-		if cmd.Name() == args[0] && cmd.Run != nil {
+		if cmd.Name() == args[0] && cmd.Runnable() {
 			cmd.Flag.Usage = func() {
 				cmd.printUsage()
 			}