This fixes it for me.

;; Work around a bug in split-window-keep-point and completion.
(defadvice completion-at-point (around completion-at-point-around)
  "Point safe completion"
  (let ((split-window-keep-point t))
    ad-do-it))
(ad-activate 'completion-at-point)