diff --git a/src/ops.c b/src/ops.c
index 614ada5..fa6a4c4 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -942,7 +942,8 @@
 	    curwin->w_cursor = curpos;	// restore curwin->w_cursor
 	    (void)do_join(2, FALSE, FALSE, FALSE, FALSE);
 	}
-	auto_format(FALSE, TRUE);
+	if (oap->op_type == OP_DELETE)
+	    auto_format(FALSE, TRUE);
     }
 
     msgmore(curbuf->b_ml.ml_line_count - old_lcount);
@@ -1809,6 +1810,7 @@
 	    vim_free(ins_text);
 	}
     }
+    auto_format(FALSE, TRUE);
 
     return retval;
 }