diff --git a/haskell-mode.el b/haskell-mode.el
index 62fabad2a..2b96f49dd 100644
--- a/haskell-mode.el
+++ b/haskell-mode.el
@@ -872,7 +872,8 @@ To be added to `flymake-init-create-temp-buffer-copy'."
 
 (defun haskell-mode-before-save-handler ()
   "Function that will be called before buffer's saving."
-  )
+  (when haskell-stylish-on-save
+    (ignore-errors (haskell-mode-stylish-buffer))))
 
 ;; From Bryan O'Sullivan's blog:
 ;; http://www.serpentine.com/blog/2007/10/09/using-emacs-to-insert-scc-annotations-in-haskell-code/
diff --git a/haskell.el b/haskell.el
index 8995d97a1..a454c54d6 100644
--- a/haskell.el
+++ b/haskell.el
@@ -380,12 +380,7 @@ If `haskell-process-load-or-reload-prompt' is nil, accept `default'."
   "Function that will be called after buffer's saving."
   (when haskell-tags-on-save
     (ignore-errors (when (and (boundp 'haskell-session) haskell-session)
-                     (haskell-process-generate-tags))))
-  (when haskell-stylish-on-save
-    (ignore-errors (haskell-mode-stylish-buffer))
-    (let ((before-save-hook '())
-          (after-save-hook '()))
-      (basic-save-buffer))))
+                     (haskell-process-generate-tags)))))
 
 ;;;###autoload
 (defun haskell-mode-tag-find (&optional _next-p)