diff --git a/full-ack.el b/full-ack.el
index 5a7b0f7..c3f3a34 100644
--- a/full-ack.el
+++ b/full-ack.el
@@ -333,7 +333,7 @@ This can be used in `ack-root-directory-functions'."
         (if (> c 0)
             (when (eq ack-display-buffer 'after)
               (display-buffer (current-buffer)))
-          (kill-buffer (current-buffer)))
+          (kill-buffer-and-window))
         (message "Ack finished with %d match%s" c (if (eq c 1) "" "es"))))))
 
 (defun ack-filter (proc output)
@@ -699,7 +699,8 @@ DIRECTORY is the root directory.  If called interactively, it is determined by
                   (marker-buffer marker))
       (compilation-goto-locus msg marker end)
       (set-marker msg nil)
-      (set-marker end nil))))
+      (set-marker end nil)
+      (delete-other-windows))))
 
 ;;; ack-mode ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;