1 files changed, 4 insertions, 0 deletions

diff --git a/src/window.c b/src/window.c
index 67fe10fe26c..95a51c3ecb9 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1452,9 +1452,13 @@ value is reasonable when this function is called.")
     CHECK_LIVE_WINDOW (window, 0);
 
   w = XWINDOW (window);
+
   startpos = marker_position (w->start);
   top = XFASTINT (w->top) - FRAME_MENU_BAR_LINES (XFRAME (WINDOW_FRAME (w)));
 
+  if (MINI_WINDOW_P (w) && top > 0)
+    error ("Can't expand minibuffer to full frame");
+
   window_loop (DELETE_OTHER_WINDOWS, window, 0, WINDOW_FRAME (w));
 
   /* Try to minimize scrolling, by setting the window start to the point