diff --git a/modules/lang/haskell/autoload.el b/modules/lang/haskell/autoload.el
index d3c36a20b..cfcd12be0 100644
--- a/modules/lang/haskell/autoload.el
+++ b/modules/lang/haskell/autoload.el
@@ -4,7 +4,11 @@
 (defun +haskell/open-repl (&optional arg)
   "Opens a Haskell REPL."
   (interactive "P")
-  (display-buffer
-   (if (featurep! +intero)
-       (intero-repl-buffer arg)
-     (haskell-session-interactive-buffer (haskell-session)))))
+  (if-let*
+      ((window
+        (display-buffer
+         (if (featurep! +intero)
+             (intero-repl-buffer arg)
+           (haskell-session-interactive-buffer (haskell-session))))))
+      (window-buffer window)
+    (error "Failed to display Haskell REPL")))