Index: contrib/slime-fuzzy.el
===================================================================
RCS file: /project/slime/cvsroot/slime/contrib/slime-fuzzy.el,v
retrieving revision 1.9
diff -u -r1.9 slime-fuzzy.el
--- contrib/slime-fuzzy.el	8 Jan 2009 10:33:12 -0000	1.9
+++ contrib/slime-fuzzy.el	15 May 2009 22:21:40 -0000
@@ -281,8 +281,8 @@
                  (slime-fuzzy-done))
                 ;; Incomplete
                 (t
-                 (slime-minibuffer-respecting-message "Complete but not unique")
-                 (slime-fuzzy-choices-buffer completion-set interrupted-p beg end)))))))
+                 (slime-fuzzy-choices-buffer completion-set interrupted-p beg end)
+                 (slime-minibuffer-respecting-message "Complete but not unique")))))))
 
 
 (defun slime-get-fuzzy-buffer ()
@@ -369,7 +369,9 @@
       (setq buffer-quit-function 'slime-fuzzy-abort)) ; M-Esc Esc
     (when slime-fuzzy-completion-in-place
       ;; switch back to the original buffer
-      (switch-to-buffer-other-window slime-fuzzy-target-buffer))))
+      (if (minibufferp slime-fuzzy-target-buffer)
+          (select-window (minibuffer-window))
+          (switch-to-buffer-other-window slime-fuzzy-target-buffer)))))
 
 (defun slime-fuzzy-fill-completions-buffer (completions interrupted-p)
   "Erases and fills the completion buffer with the given completions."