diff --git a/cmd/kops/set_cluster.go b/cmd/kops/set_cluster.go
index b8105edd77..0c98d5a6e3 100644
--- a/cmd/kops/set_cluster.go
+++ b/cmd/kops/set_cluster.go
@@ -67,7 +67,7 @@ func NewCmdSetCluster(f *util.Factory, out io.Writer) *cobra.Command {
 			}
 
 			if options.ClusterName == "" {
-				options.ClusterName = ClusterNameFromKubecfg()
+				options.ClusterName = rootCommand.ClusterName()
 			}
 
 			if err := commands.RunSetCluster(f, cmd, out, options); err != nil {