diff --git a/components/finsh/Kconfig b/components/finsh/Kconfig
index 4c5740929e..1a980b06aa 100644
--- a/components/finsh/Kconfig
+++ b/components/finsh/Kconfig
@@ -11,65 +11,69 @@ config RT_USING_MSH
 
 if RT_USING_MSH
 
-config FINSH_THREAD_NAME
-    string "The msh thread name"
-    default "tshell"
-config FINSH_USING_HISTORY
-    bool "Enable command history feature"
-    default y
-if FINSH_USING_HISTORY
-config FINSH_HISTORY_LINES
-    int "The command history line number"
-    default 5
-endif
+    config FINSH_THREAD_NAME
+        string "The msh thread name"
+        default "tshell"
 
-config FINSH_USING_SYMTAB
-    bool "Using symbol table for commands"
-    default y
+    config FINSH_THREAD_PRIORITY
+        int "The priority level value of thread"
+        default 20
 
-config FINSH_USING_DESCRIPTION
-    bool "Keeping description in symbol table"
-    default y
+    config FINSH_THREAD_STACK_SIZE
+        int "The stack size for thread"
+        default 4096
 
-config FINSH_USING_BUILT_IN_COMMANDS
-    bool "Enable built-in commands, such as list_thread"
-    default y
+    config FINSH_USING_HISTORY
+        bool "Enable command history feature"
+        default y
 
-config FINSH_ECHO_DISABLE_DEFAULT
-    bool "Disable the echo mode in default"
-    default n
-    
-config FINSH_THREAD_PRIORITY
-    int "The priority level value of thread"
-    default 20
+    if FINSH_USING_HISTORY
+        config FINSH_HISTORY_LINES
+            int "The command history line number"
+            default 5
+    endif
 
-config FINSH_THREAD_STACK_SIZE
-    int "The stack size for thread"
-    default 4096
+    config FINSH_USING_SYMTAB
+        bool "Using symbol table for commands"
+        default y
 
-config FINSH_CMD_SIZE
-    int "The command line size for shell"
-    default 80
+    config FINSH_CMD_SIZE
+        int "The command line size for shell"
+        default 80
 
-config FINSH_USING_AUTH
-    bool "shell support authentication"
-    default n
+    config FINSH_USING_BUILT_IN_COMMANDS
+        bool "Enable built-in commands, such as list_thread"
+        default y
 
-if FINSH_USING_AUTH
-config FINSH_DEFAULT_PASSWORD
-    string "The default password for shell authentication"
-    default "rtthread"
-config FINSH_PASSWORD_MIN
-    int "The password min length"
-    default 6
-config FINSH_PASSWORD_MAX
-    int "The password max length"
-    default RT_NAME_MAX
-endif
+    config FINSH_USING_DESCRIPTION
+        bool "Keeping description in symbol table"
+        default y
 
-config FINSH_ARG_MAX
-    int "The number of arguments for a shell command"
-    default 10
+    config FINSH_ECHO_DISABLE_DEFAULT
+        bool "Disable the echo mode in default"
+        default n
+
+    config FINSH_USING_AUTH
+        bool "shell support authentication"
+        default n
+
+    if FINSH_USING_AUTH
+        config FINSH_DEFAULT_PASSWORD
+            string "The default password for shell authentication"
+            default "rtthread"
+
+        config FINSH_PASSWORD_MIN
+            int "The password min length"
+            default 6
+
+        config FINSH_PASSWORD_MAX
+            int "The password max length"
+            default RT_NAME_MAX
+    endif
+
+    config FINSH_ARG_MAX
+        int "The number of arguments for a shell command"
+        default 10
 
 endif
 
diff --git a/components/finsh/SConscript b/components/finsh/SConscript
index bacd25ea12..65395f346b 100644
--- a/components/finsh/SConscript
+++ b/components/finsh/SConscript
@@ -14,6 +14,6 @@ if GetDepend('RT_USING_DFS'):
 
 CPPPATH = [cwd]
 
-group = DefineGroup('msh', src, depend = ['RT_USING_FINSH'], CPPPATH = CPPPATH)
+group = DefineGroup('Finsh', src, depend = ['RT_USING_FINSH'], CPPPATH = CPPPATH)
 
 Return('group')