diff --git a/lisp/mitch-packages.el b/lisp/mitch-packages.el
index 09a69f3..9060cbb 100644
--- a/lisp/mitch-packages.el
+++ b/lisp/mitch-packages.el
@@ -662,12 +662,13 @@ Return nil if DIR is not in a hugo project at all."
       (if hugo-dir
 	  (let* ((default-directory hugo-dir)
 		 (buffer (get-buffer-create "*hugo*")))
-	    (pop-to-buffer buffer)
-	    (compilation-mode)
-	    (if (zerop (let ((inhibit-read-only t))
-			 (call-process "sh" nil buffer t "-c" "hugo")))
-		(message "Hugo re-generated!")
-	      (error "Hugo Failed, better change something!"))))))
+	    (with-current-buffer buffer
+	      ;; (pop-to-buffer buffer)
+	      (compilation-mode)
+	      (if (zerop (let ((inhibit-read-only t))
+			   (call-process "sh" nil buffer t "-c" "hugo")))
+		  (message "Hugo re-generated!")
+		(error "Hugo Failed, better change something!")))))))
   (add-hook 'after-save-hook
 	    (lambda () (hugo-compile default-directory))))