diff --git a/src/gui/client/main-window.lisp b/src/gui/client/main-window.lisp
index e655b6d..c84de9a 100644
--- a/src/gui/client/main-window.lisp
+++ b/src/gui/client/main-window.lisp
@@ -164,10 +164,12 @@
   (lambda (hint)
     (if (> (length hint) 2)
         (with-notify-errors
-          (enqueue-request-and-wait-results :complete-net-address
-                                            1
-                                            ev:+maximum-event-priority+
-                                            hint))
+          (let ((match-results (enqueue-request-and-wait-results :complete-net-address
+                                                                 1
+                                                                 ev:+maximum-event-priority+
+                                                                 hint)))
+            (values (getf match-results :matches)
+                    (getf match-results :indices))))
         hint)))
 
 (defmethod initialize-instance :after ((object tool-bar) &key &allow-other-keys)