diff --git a/lisp/windmove.el b/lisp/windmove.el
index d69a09f3d1e..ed76c67ac46 100644
--- a/lisp/windmove.el
+++ b/lisp/windmove.el
@@ -422,10 +422,10 @@ repeated commands."
 
     (cond ((null other-window)
            (user-error "No window %s from selected window" dir))
+          ((eq other-window 'no-select))
           ((and (window-minibuffer-p other-window)
                 (not (minibuffer-window-active-p other-window)))
            (user-error "Minibuffer is inactive"))
-          ((eq other-window 'no-select))
           (t
            (select-window other-window)))))