diff --git a/pkg/target/target_flags.go b/pkg/target/target_flags.go
index 296ba403..6e83b8da 100644
--- a/pkg/target/target_flags.go
+++ b/pkg/target/target_flags.go
@@ -87,7 +87,7 @@ func (tf *targetFlagsImpl) AddFlags(flags *pflag.FlagSet) {
 }
 
 func (tf *targetFlagsImpl) ToTarget() Target {
-	return NewTarget(tf.gardenName, tf.projectName, tf.seedName, tf.shootName)
+	return NewTarget(tf.gardenName, tf.projectName, tf.seedName, tf.shootName).WithControlPlane(tf.controlPlane)
 }
 
 func (tf *targetFlagsImpl) isEmpty() bool {
diff --git a/pkg/target/target_flags_test.go b/pkg/target/target_flags_test.go
index 92de60ea..ce1f46a5 100644
--- a/pkg/target/target_flags_test.go
+++ b/pkg/target/target_flags_test.go
@@ -77,6 +77,15 @@ var _ = Describe("Target Flags", func() {
 		Expect(t.ControlPlane()).To(BeTrue())
 	})
 
+	It("should convert to target", func() {
+		t := target.NewTargetFlags("garden", "project", "", "shoot", true).ToTarget()
+		Expect(t.GardenName()).To(Equal("garden"))
+		Expect(t.ProjectName()).To(Equal("project"))
+		Expect(t.SeedName()).To(BeEmpty())
+		Expect(t.ShootName()).To(Equal("shoot"))
+		Expect(t.ControlPlane()).To(BeTrue())
+	})
+
 	It("should fail to override a target", func() {
 		tf := target.NewTargetFlags("", "", "", "shoot", false)
 		_, err := tf.OverrideTarget(target.NewTarget("", "b", "c", "d"))