diff --git a/x/downtime/client/cli/query.go b/x/downtime/client/cli/query.go
index 9b2a7cc108..40f9b30a0f 100644
--- a/x/downtime/client/cli/query.go
+++ b/x/downtime/client/cli/query.go
@@ -1,6 +1,7 @@
 package cli
 
 import (
+	"fmt"
 	"strconv"
 
 	"github.com/cosmos/cosmos-sdk/client"
@@ -11,7 +12,11 @@ import (
 
 func NewQueryCmd() *cobra.Command {
 	cmd := &cobra.Command{
-		Use: types.ModuleName + "query commands",
+		Use:                        types.ModuleName,
+		Short:                      fmt.Sprintf("Querying commands for the %s module", types.ModuleName),
+		DisableFlagParsing:         true,
+		SuggestionsMinimumDistance: 2,
+		RunE:                       client.ValidateCmd,
 	}
 
 	cmd.AddCommand(CmdQueryDowntime(), CmdQueryParams())
diff --git a/x/downtime/client/cli/tx.go b/x/downtime/client/cli/tx.go
index 5d7f056bfd..2f52351abe 100644
--- a/x/downtime/client/cli/tx.go
+++ b/x/downtime/client/cli/tx.go
@@ -9,7 +9,10 @@ import (
 
 func NewTxCmd() *cobra.Command {
 	return &cobra.Command{
-		Use: types.ModuleName + "tx commands",
+		Use:                        types.ModuleName,
+		Short:                      fmt.Sprintf("%s transactions subcommands", types.ModuleName),
+		DisableFlagParsing:         true,
+		SuggestionsMinimumDistance: 2,
 		RunE: func(_ *cobra.Command, _ []string) error {
 			return fmt.Errorf("the downtime module does not have any tx commands")
 		},