diff --git a/src/frontends/lean/elaborator.cpp b/src/frontends/lean/elaborator.cpp
index bf939c53b7..dd8adc843c 100644
--- a/src/frontends/lean/elaborator.cpp
+++ b/src/frontends/lean/elaborator.cpp
@@ -1066,6 +1066,51 @@ expr elaborator::visit_overloaded_app(buffer<expr> const & fns, buffer<expr> con
     }
 }
 
+expr elaborator::visit_no_confusion(expr const & fn, buffer<expr> const & args, optional<expr> const & expected_type, expr const & ref) {
+    name fn_name = const_name(fn);
+    if (!expected_type) {
+        throw elaborator_exception(ref, format("invalid '") + format(fn_name) + format ("' application, ") +
+                                   format("elaborator has special support for no_confusion ") +
+                                   format("but the expected type must be known"));
+    }
+    if (args.empty()) {
+        throw elaborator_exception(ref,
+                                   format("invalid occurrence of function '") + format(fn_name) +
+                                   format ("', it must be applied to at least one argument (possible solution: use '@')"));
+    }
+    /* I.no_confusion functions have a type of the form
+
+       Pi (params) (indices) (C : Type) (lhs rhs : I params indices) (H : lhs = rhs), I.no_confusion_type params indices C lhs rhs
+
+       The type (I.no_confusion_type params indices C lhs rhs) is C if lhs and rhs are distinct constructors,
+       and (Pi Hs, C) if they are the same constructor where Hs is a sequence of equalities.
+
+       (C : Type) is the expected type.
+
+       To make the elaborator more effective, we first elaborate the first explicit argument (i.e., args[0]) and obtain Heq,
+       and create the fake pre-term
+
+       (I.no_confusion _ ... _ (as-is expected_type) _ _ (as-is Heq) args[1] ... args[n-1])
+
+       Then, we elaborate this new fake pre-term.
+    */
+    expr Heq      = checkpoint_visit(args[0], none_expr());
+    name I_name   = fn_name.get_prefix();
+    unsigned nparams  = *inductive::get_num_params(m_env, I_name);
+    unsigned nindices = *inductive::get_num_indices(m_env, I_name);
+    buffer<expr> new_args;
+    for (unsigned i = 0; i < nparams + nindices; i++) {
+        new_args.push_back(copy_tag(ref, mk_expr_placeholder()));
+    }
+    new_args.push_back(copy_tag(ref, mk_as_is(*expected_type)));
+    new_args.push_back(copy_tag(ref, mk_expr_placeholder())); // lhs
+    new_args.push_back(copy_tag(ref, mk_expr_placeholder())); // rhs
+    new_args.push_back(copy_tag(args[0], mk_as_is(Heq)));
+    for (unsigned i = 1; i < args.size(); i++)
+        new_args.push_back(args[i]);
+    return visit_default_app_core(fn, arg_mask::All, new_args, false, expected_type, ref);
+}
+
 expr elaborator::visit_app_core(expr fn, buffer<expr> const & args, optional<expr> const & expected_type,
                                 expr const & ref) {
     arg_mask amask = arg_mask::Default;
@@ -1102,6 +1147,8 @@ expr elaborator::visit_app_core(expr fn, buffer<expr> const & args, optional<exp
                                "' because it is not fully applied, #" << info->m_nexplicit <<
                                " explicit arguments expected\n";);
                 }
+            } else if (is_no_confusion(m_env, const_name(new_fn))) {
+                return visit_no_confusion(new_fn, args, expected_type, ref);
             }
         }
         return visit_default_app(new_fn, amask, args, expected_type, ref);
diff --git a/src/frontends/lean/elaborator.h b/src/frontends/lean/elaborator.h
index 3d8c1c1e0a..cb183cc39e 100644
--- a/src/frontends/lean/elaborator.h
+++ b/src/frontends/lean/elaborator.h
@@ -172,6 +172,7 @@ private:
                               optional<expr> const & expected_type, expr const & ref);
     expr visit_elim_app(expr const & fn, elim_info const & info, buffer<expr> const & args,
                         optional<expr> const & expected_type, expr const & ref);
+    expr visit_no_confusion(expr const & fn, buffer<expr> const & args, optional<expr> const & expected_type, expr const & ref);
     expr visit_app_core(expr fn, buffer<expr> const & args, optional<expr> const & expected_type, expr const & ref);
     expr visit_local(expr const & e, optional<expr> const & expected_type);
     expr visit_constant(expr const & e, optional<expr> const & expected_type);
diff --git a/tests/lean/private_structure.lean b/tests/lean/private_structure.lean
index ace2181294..5970ba9a99 100644
--- a/tests/lean/private_structure.lean
+++ b/tests/lean/private_structure.lean
@@ -11,7 +11,7 @@ check point.rec
 check point.rec_on
 check point.cases_on
 check point.induction_on
-check point.no_confusion
+check @point.no_confusion
 check point.x
 check point.y
 
diff --git a/tests/lean/private_structure.lean.expected.out b/tests/lean/private_structure.lean.expected.out
index bb96d19b8b..0d16f5865b 100644
--- a/tests/lean/private_structure.lean.expected.out
+++ b/tests/lean/private_structure.lean.expected.out
@@ -7,7 +7,7 @@ point.rec : (Π x y, ?M_1 (point.mk x y)) → Π n, ?M_1 n
 point.rec_on : Π n, (Π x y, ?M_1 (point.mk x y)) → ?M_1 n
 point.cases_on : Π n, (Π x y, ?M_1 (point.mk x y)) → ?M_1 n
 point.induction_on : ∀ n, (∀ x y, ?M_1 (point.mk x y)) → ?M_1 n
-point.no_confusion : ?M_2 = ?M_3 → private.1706149582.point.no_confusion_type ?M_1 ?M_2 ?M_3
+point.no_confusion : Π {P} {v1 v2}, v1 = v2 → private.1706149582.point.no_confusion_type P v1 v2
 point.x : point → ℕ
 point.y : point → ℕ
 bla : Type₁
diff --git a/tests/lean/run/no_confusion1.lean b/tests/lean/run/no_confusion1.lean
new file mode 100644
index 0000000000..c2830079e5
--- /dev/null
+++ b/tests/lean/run/no_confusion1.lean
@@ -0,0 +1,15 @@
+set_option new_elaborator true
+open nat
+
+theorem ex1 (n : nat) : bit0 n ≠ 1 :=
+nat.cases_on n
+  (show 0 ≠ 1, from ne.symm nat.one_ne_zero)
+  (λ m h1,
+    have h2 : succ (succ (m + m)) = 1, from nat.succ_add m m ▸ h1,
+    nat.no_confusion h2 (λ h3, absurd h3 (nat.succ_ne_zero (m + m))))
+
+theorem ex2 (n : nat) : succ n ≠ 0 :=
+λ h, nat.no_confusion h
+
+theorem ex3 (n : nat) : succ (succ n) ≠ 1 :=
+λ h, nat.no_confusion h (λ h, nat.no_confusion h)