diff --git a/internal/cmd/base/format.go b/internal/cmd/base/format.go
index 28f4ec0e1..ef92761bb 100644
--- a/internal/cmd/base/format.go
+++ b/internal/cmd/base/format.go
@@ -60,16 +60,20 @@ func WrapSlice(prefixSpaces int, input []string) string {
 
 func WrapMap(prefixSpaces, maxLengthOverride int, input map[string]interface{}) string {
 	maxKeyLength := maxLengthOverride
-	var sortedKeys []string
 	if maxKeyLength == 0 {
 		for k := range input {
-			sortedKeys = append(sortedKeys, k)
 			if len(k) > maxKeyLength {
 				maxKeyLength = len(k)
 			}
 		}
 	}
+
+	var sortedKeys []string
+	for k := range input {
+		sortedKeys = append(sortedKeys, k)
+	}
 	sort.Strings(sortedKeys)
+
 	var ret []string
 	for _, k := range sortedKeys {
 		v := input[k]