diff --git a/.emacs.d/lisp/patch-geiser.el b/.emacs.d/lisp/patch-geiser.el
index e656457a..4357cebb 100644
--- a/.emacs.d/lisp/patch-geiser.el
+++ b/.emacs.d/lisp/patch-geiser.el
@@ -7,4 +7,10 @@
     (switch-to-buffer-other-window "*info*"))
   (search-forward (format "%s" id) nil t))
 
+;; See https://github.com/emacs-helm/helm/issues/2134 and
+;; https://gitlab.com/jaor/geiser/issues/180
+(when (>= emacs-major-version 26)
+  (setq geiser-completion--module-list-func
+        (completion-table-dynamic 'geiser-completion--module-list)))
+
 (provide 'patch-geiser)