diff --git a/scheme/nuit-engine.scm b/scheme/nuit-engine.scm
index b7ff9a5..9a6ddbf 100644
--- a/scheme/nuit-engine.scm
+++ b/scheme/nuit-engine.scm
@@ -777,9 +777,15 @@
      win (result-buffer) (focus-on-result-buffer?))
     (refresh-result-window)))
 
-;; #### implement me
 (define (completer-function-for-command command)
-  #f)
+  (let ((alist
+	 (map (lambda (p)
+		(cons (command-plugin-command p)
+		      (command-plugin-completer p)))
+	      (command-plugin-list))))
+    (cond 
+     ((assoc command alist) => cdr)
+     (else #f))))
 
 (define (call-completer command args prefix arg-pos)
   (cond