diff --git a/main-settings/src/main/scala/sbt/Def.scala b/main-settings/src/main/scala/sbt/Def.scala
index b01b9fd5e..98cf3b27b 100644
--- a/main-settings/src/main/scala/sbt/Def.scala
+++ b/main-settings/src/main/scala/sbt/Def.scala
@@ -237,7 +237,8 @@ object Def extends Init[Scope] with TaskMacroExtra with InitializeImplicits:
   inline def inputTask[A1](inline a: A1): Def.Initialize[InputTask[A1]] =
     ${ InputTaskMacro.inputTaskMacroImpl[A1]('a) }
 
-  // def taskIf[T](a: T): Def.Initialize[Task[T]] = macro taskIfMacroImpl[T]
+  inline def taskIf[A1](inline a: A1): Def.Initialize[Task[A1]] =
+    ${ TaskMacro.taskIfImpl[A1]('a) }
 
   private[sbt] def selectITask[A1, A2](
       fab: Initialize[Task[Either[A1, A2]]],
diff --git a/main-settings/src/main/scala/sbt/std/TaskMacro.scala b/main-settings/src/main/scala/sbt/std/TaskMacro.scala
index 5a1020c48..ec56f8aea 100644
--- a/main-settings/src/main/scala/sbt/std/TaskMacro.scala
+++ b/main-settings/src/main/scala/sbt/std/TaskMacro.scala
@@ -54,17 +54,24 @@ object TaskMacro:
 
   def taskMacroImpl[A1: Type](t: Expr[A1])(using qctx: Quotes): Expr[Initialize[Task[A1]]] =
     t match
-      case '{ if ($cond) then $thenp else $elsep } => mkIfS[A1](t)
+      case '{ if ($cond) then $thenp else $elsep } => taskIfImpl[A1](t)
       case _ =>
         val convert1 = new FullConvert(qctx)
         convert1.contMapN[A1, F, Id](t, convert1.appExpr)
 
-  def mkIfS[A1: Type](t: Expr[A1])(using qctx: Quotes): Expr[Initialize[Task[A1]]] =
-    t match
+  def taskIfImpl[A1: Type](expr: Expr[A1])(using qctx: Quotes): Expr[Initialize[Task[A1]]] =
+    import qctx.reflect.*
+    expr match
       case '{ if ($cond) then $thenp else $elsep } =>
         '{
           Def.ifS[A1](Def.task($cond))(Def.task[A1]($thenp))(Def.task[A1]($elsep))
         }
+      case '{ (${ stats }: a); if ($cond) then $thenp else $elsep } =>
+        '{
+          Def.ifS[A1](Def.task { $stats; $cond })(Def.task[A1]($thenp))(Def.task[A1]($elsep))
+        }
+      case _ =>
+        report.errorAndAbort(s"Def.taskIf(...) must contain if expression but found ${expr.asTerm}")
 
   def taskDynMacroImpl[A1: Type](
       t: Expr[Initialize[Task[A1]]]