diff --git a/src/block_in_if_condition.rs b/src/block_in_if_condition.rs
index f7d8c95ee76..53f11366cae 100644
--- a/src/block_in_if_condition.rs
+++ b/src/block_in_if_condition.rs
@@ -80,7 +80,7 @@ impl LateLintPass for BlockInIfCondition {
                         if let Some(ref ex) = block.expr {
                             // don't dig into the expression here, just suggest that they remove
                             // the block
-                            if differing_macro_contexts(expr.span, ex.span) {
+                            if in_macro(cx, expr.span) || differing_macro_contexts(expr.span, ex.span) {
                                 return;
                             }
                             span_help_and_lint(cx,
@@ -92,7 +92,7 @@ impl LateLintPass for BlockInIfCondition {
                                                         snippet_block(cx, then.span, "..")));
                         }
                     } else {
-                        if differing_macro_contexts(expr.span, block.stmts[0].span) {
+                        if in_macro(cx, expr.span) || differing_macro_contexts(expr.span, block.stmts[0].span) {
                             return;
                         }
                         // move block higher