2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3708758df4b..ad193ea0d64 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-07-28  Juanma Barranquero  <lekktu@gmail.com>
+
+        * desktop.el (desktop--make-frame): Include `minibuffer' in the
+        minimal set of parameters passed when creating a frame, because
+        the minibuffer status of a frame cannot be changed later.
+
 2013-07-28  Stephen Berman  <stephen.berman@gmx.net>
 
         * calendar/todo-mode.el (todo-rename-file): Fix incorrect use of
diff --git a/lisp/desktop.el b/lisp/desktop.el
index d3bb6648099..299bdc0eeb4 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1394,7 +1394,7 @@ its window state.  Internal use only."
                     (make-frame-on-display display
                                            (cons '(visibility)
                                                  (cl-loop
-                                                  for param in '(left top width height)
+                                                  for param in '(left top width height minibuffer)
                                                   collect (assq param filtered-cfg))))))
     (modify-frame-parameters frame
                              (if (eq (frame-parameter frame 'fullscreen) fullscreen)