diff --git a/toolchain/parse/handle_expr.cpp b/toolchain/parse/handle_expr.cpp
index 56ad2a5ffb82..87ef6cbc003d 100644
--- a/toolchain/parse/handle_expr.cpp
+++ b/toolchain/parse/handle_expr.cpp
@@ -396,6 +396,7 @@ auto HandleExprLoopForPrefixOperator(Context& context) -> void {
 
 auto HandleExprLoopForShortCircuitOperatorAsAnd(Context& context) -> void {
   auto state = context.PopState();
+
   HandleExprLoopForOperator(context, state, NodeKind::ShortCircuitOperatorAnd);
 }
 
@@ -405,70 +406,6 @@ auto HandleExprLoopForShortCircuitOperatorAsOr(Context& context) -> void {
   HandleExprLoopForOperator(context, state, NodeKind::ShortCircuitOperatorOr);
 }
 
-auto HandleIfExprFinishCondition(Context& context) -> void {
-  auto state = context.PopState();
-
-  context.AddNode(NodeKind::IfExprIf, state.token, state.has_error);
-
-  if (context.PositionIs(Lex::TokenKind::Then)) {
-    context.PushState(State::IfExprFinishThen);
-    context.ConsumeChecked(Lex::TokenKind::Then);
-    context.PushStateForExpr(*PrecedenceGroup::ForLeading(Lex::TokenKind::If));
-  } else {
-    // TODO: Include the location of the `if` token.
-    CARBON_DIAGNOSTIC(ExpectedThenAfterIf, Error,
-                      "Expected `then` after `if` condition.");
-    if (!state.has_error) {
-      context.emitter().Emit(*context.position(), ExpectedThenAfterIf);
-    }
-    // Add placeholders for `IfExprThen` and final `Expr`.
-    context.AddLeafNode(NodeKind::InvalidParse, *context.position(),
-                        /*has_error=*/true);
-    context.AddLeafNode(NodeKind::InvalidParse, *context.position(),
-                        /*has_error=*/true);
-    context.ReturnErrorOnState();
-  }
-}
-
-auto HandleIfExprFinishThen(Context& context) -> void {
-  auto state = context.PopState();
-
-  context.AddNode(NodeKind::IfExprThen, state.token, state.has_error);
-
-  if (context.PositionIs(Lex::TokenKind::Else)) {
-    context.PushState(State::IfExprFinishElse);
-    context.ConsumeChecked(Lex::TokenKind::Else);
-    context.PushStateForExpr(*PrecedenceGroup::ForLeading(Lex::TokenKind::If));
-  } else {
-    // TODO: Include the location of the `if` token.
-    CARBON_DIAGNOSTIC(ExpectedElseAfterIf, Error,
-                      "Expected `else` after `if ... then ...`.");
-    if (!state.has_error) {
-      context.emitter().Emit(*context.position(), ExpectedElseAfterIf);
-    }
-    // Add placeholder for the final `Expr`.
-    context.AddLeafNode(NodeKind::InvalidParse, *context.position(),
-                        /*has_error=*/true);
-    context.ReturnErrorOnState();
-  }
-}
-
-auto HandleIfExprFinishElse(Context& context) -> void {
-  auto else_state = context.PopState();
-
-  // Propagate the location of `else`.
-  auto if_state = context.PopState();
-  if_state.token = else_state.token;
-  if_state.has_error |= else_state.has_error;
-  context.PushState(if_state);
-}
-
-auto HandleIfExprFinish(Context& context) -> void {
-  auto state = context.PopState();
-
-  context.AddNode(NodeKind::IfExprElse, state.token, state.has_error);
-}
-
 auto HandleExprStatementFinish(Context& context) -> void {
   auto state = context.PopState();
 
diff --git a/toolchain/parse/handle_if_expr.cpp b/toolchain/parse/handle_if_expr.cpp
new file mode 100644
index 000000000000..830f13b8435b
--- /dev/null
+++ b/toolchain/parse/handle_if_expr.cpp
@@ -0,0 +1,75 @@
+// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
+// Exceptions. See /LICENSE for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+#include "toolchain/lex/token_kind.h"
+#include "toolchain/parse/context.h"
+#include "toolchain/parse/handle.h"
+
+namespace Carbon::Parse {
+
+auto HandleIfExprFinishCondition(Context& context) -> void {
+  auto state = context.PopState();
+
+  context.AddNode(NodeKind::IfExprIf, state.token, state.has_error);
+
+  if (context.PositionIs(Lex::TokenKind::Then)) {
+    context.PushState(State::IfExprFinishThen);
+    context.ConsumeChecked(Lex::TokenKind::Then);
+    context.PushStateForExpr(*PrecedenceGroup::ForLeading(Lex::TokenKind::If));
+  } else {
+    // TODO: Include the location of the `if` token.
+    CARBON_DIAGNOSTIC(ExpectedThenAfterIf, Error,
+                      "Expected `then` after `if` condition.");
+    if (!state.has_error) {
+      context.emitter().Emit(*context.position(), ExpectedThenAfterIf);
+    }
+    // Add placeholders for `IfExprThen` and final `Expr`.
+    context.AddLeafNode(NodeKind::InvalidParse, *context.position(),
+                        /*has_error=*/true);
+    context.AddLeafNode(NodeKind::InvalidParse, *context.position(),
+                        /*has_error=*/true);
+    context.ReturnErrorOnState();
+  }
+}
+
+auto HandleIfExprFinishThen(Context& context) -> void {
+  auto state = context.PopState();
+
+  context.AddNode(NodeKind::IfExprThen, state.token, state.has_error);
+
+  if (context.PositionIs(Lex::TokenKind::Else)) {
+    context.PushState(State::IfExprFinishElse);
+    context.ConsumeChecked(Lex::TokenKind::Else);
+    context.PushStateForExpr(*PrecedenceGroup::ForLeading(Lex::TokenKind::If));
+  } else {
+    // TODO: Include the location of the `if` token.
+    CARBON_DIAGNOSTIC(ExpectedElseAfterIf, Error,
+                      "Expected `else` after `if ... then ...`.");
+    if (!state.has_error) {
+      context.emitter().Emit(*context.position(), ExpectedElseAfterIf);
+    }
+    // Add placeholder for the final `Expr`.
+    context.AddLeafNode(NodeKind::InvalidParse, *context.position(),
+                        /*has_error=*/true);
+    context.ReturnErrorOnState();
+  }
+}
+
+auto HandleIfExprFinishElse(Context& context) -> void {
+  auto else_state = context.PopState();
+
+  // Propagate the location of `else`.
+  auto if_state = context.PopState();
+  if_state.token = else_state.token;
+  if_state.has_error |= else_state.has_error;
+  context.PushState(if_state);
+}
+
+auto HandleIfExprFinish(Context& context) -> void {
+  auto state = context.PopState();
+
+  context.AddNode(NodeKind::IfExprElse, state.token, state.has_error);
+}
+
+}  // namespace Carbon::Parse