diff --git a/tools/nimgrep.nim b/tools/nimgrep.nim
index 26e219330bd8..42b192f2407c 100644
--- a/tools/nimgrep.nim
+++ b/tools/nimgrep.nim
@@ -44,7 +44,7 @@ Options:
   --color[:always]    force color even if output is redirected
   --colorTheme:THEME  select color THEME from 'simple' (default),
                       'bnw' (black and white) ,'ack', or 'gnu' (GNU grep)
-  --afterContext:N,   
+  --afterContext:N,
                -a:N   print N lines of trailing context after every match
   --beforeContext:N,
                -b:N   print N lines of leading context before every match
@@ -412,6 +412,8 @@ proc processFile(pattern; filename: string; counter: var int, errors: var int) =
       else:
         printContextBetween(si, prevMi, curMi)
       printMatch(si.fileName, curMi)
+      if t.last == buffer.len - 1:
+        stdout.write("\n")
       stdout.flushFile()
     else:
       let r = replace(curMi.match, pattern, replacement % matches)
@@ -659,8 +661,6 @@ else:
       walker(rep, f, counter, errors)
   if errors != 0:
     printError $errors & " errors"
-  if counter == 1:
-    stdout.write("\n")
   stdout.write($counter & " matches\n")
   if errors != 0:
     quit(1)