diff --git a/src/minibuf.c b/src/minibuf.c
index 9a65e2c9df5..13ec570e66b 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -113,7 +113,7 @@ choose_minibuf_frame ()
   if (selected_frame != 0
       && !EQ (minibuf_window, selected_frame->minibuffer_window))
     {
-#if defined(MSDOS) && !defined(HAVE_X_WINDOWS)
+#if defined(MSDOS) && !defined(HAVE_X_WINDOWS) && !defined(MULTI_FRAME)
       selected_frame->minibuffer_window = minibuf_window;
 #else
       /* I don't think that any frames may validly have a null minibuffer