diff --git a/src/expr.rs b/src/expr.rs
index 0a2fab9cd27..5f2b1f0353e 100644
--- a/src/expr.rs
+++ b/src/expr.rs
@@ -986,12 +986,7 @@ impl<'a> Rewrite for ControlFlow<'a> {
                                  block_str);
 
         if let Some(else_block) = self.else_block {
-            // Since this is an else block, we should not indent for the assignment preceding
-            // the original if, so set shape.offset to shape.indent.alignment.
-            let shape = Shape {
-                offset: shape.indent.alignment,
-                ..shape
-            };
+            let shape = Shape::indented(shape.indent, context.config);
             let mut last_in_chain = false;
             let rewrite = match else_block.node {
                 // If the else expression is another if-else expression, prevent it