diff --git a/haskell-doc.el b/haskell-doc.el
index f70c76c2e..98d58cfff 100644
--- a/haskell-doc.el
+++ b/haskell-doc.el
@@ -1604,7 +1604,7 @@ will be returned directly."
             (if (use-region-p)
                 (buffer-substring-no-properties
                  (region-beginning) (region-end))
-              (thing-at-point 'symbol 'no-properties)))
+              (haskell-ident-at-point)))
       (if sync
           (haskell-process-get-type sym #'identity t)
         (haskell-process-get-type
diff --git a/haskell.el b/haskell.el
index 4cdcbe8a4..df97478cb 100644
--- a/haskell.el
+++ b/haskell.el
@@ -93,7 +93,7 @@
            (setq symbol-bounds (bounds-of-thing-at-point 'symbol)))
         (list (car symbol-bounds) (cdr symbol-bounds)
               haskell-ghc-supported-extensions))
-       ((setq symbol-bounds (bounds-of-thing-at-point 'symbol))
+       ((setq symbol-bounds (haskell-ident-pos-at-point))
         (cl-destructuring-bind (start . end) symbol-bounds
           (list start end
                 (haskell-process-get-repl-completions